ayan.poddar/eShopOnContainers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Added variables template; finished identityapi deploy template

Browse Source
This commit is contained in:
Tim McCarthy 2020-02-20 20:26:14 -08:00
parent fe4236ee62
commit eca7acea2d
2 changed files with 35 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
deploy/aro/azure-devops-templates/variables.yml
View File

@ -1,7 +1,39 @@
variables: variables:
IdentityApiHostName: identityapi.$(OpenShiftProject).svc
RedisHostname: redis.$(OpenShiftProject).svc RedisHostname: redis.$(OpenShiftProject).svc
RabbitMqHostname: rabbitmq.$(OpenShiftProject).svc RabbitMqHostname: rabbitmq.$(OpenShiftProject).svc
SqlHostName: mssql-server-linux.$(OpenShiftProjectName).svc
PublicHostName: eshop$(EnvironmentName)
IdentityApiHostName: identityapi.$(OpenShiftProject).svc
IdentityPublicHostName: identity$(EnvironmentName) IdentityPublicHostName: identity$(EnvironmentName)
IdentityUrlExternal: https://$(IdentityPublicHostName) IdentityUrlExternal: https://$(IdentityPublicHostName)
IdentityApiUrl: http://$(IdentityApiHostName):8080 IdentityApiUrl: http://$(IdentityApiHostName):8080
BasketApiHostName: basketapi.$(OpenShiftProjectName).svc
BasketApiUrl: http://$(BasketApiHostName):8080
BasketApiHc: $(BasketApiUrl)/hc
CatalogApiHostName: catalogapi.$(OpenShiftProjectName).svc
CatalogApiUrl: http://$(CatalogApiHostName):8080
CatalogApiUrlExternal: https://$(CatalogPublicHostName)
CatalogApiHc: $(CatalogApiUrl)/hc
CatalogDbConnection: Server=$(SqlHostName);Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=$(SqlUsername);Password=$(SqlPassword)
LocationsApiHostName: locationsapi.$(OpenShiftProjectName).svc
LocationsApiUrl: http://$(LocationsApiHostName):8080
LocationsApiHc: $(LocationsApiUrl)/hc
MarketingApiHostName: marketingapi.$(OpenShiftProjectName).svc
MarketingApiUrl: http://$(MarketingApiHostName):8080
MarketingApiHc: $(MarketingApiUrl)/hc
OrderingApiHostName: orderingapi.$(OpenShiftProjectName).svc
OrderingApiUrl: http://$(OrderingApiHostName):8080
OrderingApiHc: $(OrderingApiUrl)/hc
MobileShoppingAggregatorHostName: mobileshoppingaggregator.$(OpenShiftProjectName).svc
MobileShoppingAggregatorUrl: http://$(MobileShoppingAggregatorHostName):8080
MobileShoppingAggregatorHc: $(MobileShoppingAggregatorUrl)/hc
WebShoppingAggregatorHostName: webshoppingaggregator.$(OpenShiftProjectName).svc
WebShoppingAggregatorUrl: http://$(WebShoppingAggregatorHostName):8080
WebShoppingAggregatorHc: $(WebShoppingAggregatorUrl)/hc
WebhooksApiHostName: webhooksapi.$(OpenShiftProjectName).svc
WebhooksApiUrl: http://$(WebhooksApiHostName):8080
WebhooksDbConnection: Server=$(SqlHostName);Database=Microsoft.eShopOnContainers.Services.WebhooksDb;User Id=$(SqlUsername);Password=$(SqlPassword)
WebhooksWebClientHostName: webhookclient.$(OpenShiftProjectName).svc
WebhooksWebClientUrl: http://$(WebhooksWebClientHostName):8080
WebSpaUrl: https://eshop-spa$(EnvironmentName)
WebMvcUrl: https://$(PublicHostName)

2
deploy/aro/identity-api/azure-pipelines.yml
View File

@ -35,6 +35,6 @@ stages:
- script: 'oc project $(OpenShiftProject)' - script: 'oc project $(OpenShiftProject)'
failOnStderr: true failOnStderr: true
displayName: 'Set OpenShift Project Context' displayName: 'Set OpenShift Project Context'
- script: 'oc process -f ./deploy/aro/openshift-templates/identityapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEB_SPA_URL= -p WEB_MVC_URL= -p LOCATION_API_URL= -p MARKETING_API_URL= -p BASKET_API_URL= -p ORDERING_API_URL= -p MOBILE_SHOPPING_AGGREGATOR_URL= -p WEB_SHOPPING_AGGREGATOR_URL= -p WEBHOOKS_API_URL= -p WEBHOOKS_WEB_CLIENT_URL= | oc apply -f-' - script: 'oc process -f ./deploy/aro/openshift-templates/identityapi-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p WEB_SPA_URL=$(WebSpaUrl) -p WEB_MVC_URL=$(WebMvcUrl) -p LOCATION_API_URL=$(LocationsApiUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p BASKET_API_URL=$(BasketApiUrl) -p ORDERING_API_URL=$(OrderingApiUrl) -p MOBILE_SHOPPING_AGGREGATOR_URL=$(MobileShoppingAggregatorUrl) -p WEB_SHOPPING_AGGREGATOR_URL=$(WebShoppingAggregatorUrl) -p WEBHOOKS_API_URL=$(WebhooksApiUrl) -p WEBHOOKS_WEB_CLIENT_URL=$(WebhooksWebClientUrl) | oc apply -f-'
failOnStderr: true failOnStderr: true
displayName: 'Ensure Identity API OpenShift DeploymentConfig and Service' displayName: 'Ensure Identity API OpenShift DeploymentConfig and Service'