From d511db00a418cdc56bc643cb110bddf8603d045e Mon Sep 17 00:00:00 2001 From: Tim McCarthy Date: Mon, 2 Mar 2020 14:02:22 -0600 Subject: [PATCH] Updated Identity URL to external for Web SPA --- deploy/aro/web-spa/azure-pipelines.yml | 2 +- deploy/aro/web-spa/webspa-deploy-template.yml | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/deploy/aro/web-spa/azure-pipelines.yml b/deploy/aro/web-spa/azure-pipelines.yml index 8b340c9d7..43d4f42d7 100644 --- a/deploy/aro/web-spa/azure-pipelines.yml +++ b/deploy/aro/web-spa/azure-pipelines.yml @@ -30,6 +30,6 @@ stages: - script: 'oc project $(OpenShiftProject)' failOnStderr: true displayName: 'Set OpenShift Project Context' - - script: 'oc process -f ./deploy/aro/web-spa/webspa-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-spa/webspa-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 displayName: 'Ensure Web SPA OpenShift DeploymentConfig and Service' \ No newline at end of file diff --git a/deploy/aro/web-spa/webspa-deploy-template.yml b/deploy/aro/web-spa/webspa-deploy-template.yml index 1f7d30fd8..d29179245 100644 --- a/deploy/aro/web-spa/webspa-deploy-template.yml +++ b/deploy/aro/web-spa/webspa-deploy-template.yml @@ -27,7 +27,7 @@ objects: containers: - env: - name: IdentityUrl - value: ${IDENTITY_API_URL} + value: ${IDENTITY_URL_EXTERNAL} - name: PurchaseUrl value: ${WEB_SHOPPING_API_GATEWAY_URL} - name: MarketingUrl @@ -96,9 +96,9 @@ parameters: name: TEMPLATE_NAME required: true value: webspa-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 - description: The URL of the Web Shopping API Gateway endpoint displayName: Web Shopping API Gateway URL