Browse Source

Updated the Identity URL to external for Web MVC

pull/1259/head
Tim McCarthy 5 years ago
parent
commit
9559b11f5c
2 changed files with 5 additions and 5 deletions
  1. +1
    -1
      deploy/aro/web-mvc/azure-pipelines.yml
  2. +4
    -4
      deploy/aro/web-mvc/webmvc-deploy-template.yml

+ 1
- 1
deploy/aro/web-mvc/azure-pipelines.yml View File

@ -40,7 +40,7 @@ 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/web-mvc/webmvc-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p IDENTITY_API_URL=$(IdentityApiUrl) -p WEB_SHOPPING_API_GATEWAY_URL=$(WebShoppingApiGatewayUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p ORDERING_SIGNALR_HUB_URL=$(OrderingSignalRHubUrl) | oc apply -f-'
- script: 'oc process -f ./deploy/aro/web-mvc/webmvc-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) -p IDENTITY_URL_EXTERNAL=$(IdentityUrlExternal) -p WEB_SHOPPING_API_GATEWAY_URL=$(WebShoppingApiGatewayUrl) -p MARKETING_API_URL=$(MarketingApiUrl) -p IDENTITY_API_HC_URL=$(IdentityApiHc) -p ORDERING_SIGNALR_HUB_URL=$(OrderingSignalRHubUrl) | oc apply -f-'
failOnStderr: true failOnStderr: true
displayName: 'Ensure Web MVC OpenShift DeploymentConfig and Service' displayName: 'Ensure Web MVC OpenShift DeploymentConfig and Service'
- script: 'oc apply -f ./deploy/aro/web-mvc/webmvc-public-route.json' - script: 'oc apply -f ./deploy/aro/web-mvc/webmvc-public-route.json'


+ 4
- 4
deploy/aro/web-mvc/webmvc-deploy-template.yml View File

@ -27,7 +27,7 @@ objects:
containers: containers:
- env: - env:
- name: IdentityUrl - name: IdentityUrl
value: ${IDENTITY_API_URL}
value: ${IDENTITY_URL_EXTERNAL}
- name: PurchaseUrl - name: PurchaseUrl
value: ${WEB_SHOPPING_API_GATEWAY_URL} value: ${WEB_SHOPPING_API_GATEWAY_URL}
- name: MarketingUrl - name: MarketingUrl
@ -96,9 +96,9 @@ parameters:
name: TEMPLATE_NAME name: TEMPLATE_NAME
required: true required: true
value: webmvc-deploy-template value: webmvc-deploy-template
- description: The cluster internal URL of the Identity endpoint
displayName: Identity URL
name: IDENTITY_API_URL
- description: The external URL of the Identity endpoint
displayName: Identity URL External
name: IDENTITY_URL_EXTERNAL
required: true required: true
- description: The URL of the Web Shopping API Gateway endpoint - description: The URL of the Web Shopping API Gateway endpoint
displayName: Web Shopping API Gateway URL displayName: Web Shopping API Gateway URL


Loading…
Cancel
Save