Browse Source

Added double quotes around the parameter value

pull/1259/head
Tim McCarthy 5 years ago
parent
commit
362134e645
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      deploy/aro/infrastructure/azure-pipelines.yml

+ 2
- 2
deploy/aro/infrastructure/azure-pipelines.yml View File

@ -20,7 +20,7 @@ stages:
displayName: 'Infrastructure Deployment' displayName: 'Infrastructure Deployment'
variables: variables:
SqlHostName: $[format('mssql-server-linux.{0}.svc', variables['OpenShiftProject'])] SqlHostName: $[format('mssql-server-linux.{0}.svc', variables['OpenShiftProject'])]
CatalogDbConnection: 'Server=$(SqlHostName);Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=$(SqlUsername);Password=$(SqlPassword)'
CatalogDbConnection: Server=$(SqlHostName);Database=Microsoft.eShopOnContainers.Services.CatalogDb;User Id=$(SqlUsername);Password=$(SqlPassword)
IdentityDbConnection: $[format('Server={0};Database=Microsoft.eShopOnContainers.Services.IdentityDb;User Id={1};Password={2}', variables['SqlHostName'], variables['SqlUsername'], variables['SqlPassword'])] IdentityDbConnection: $[format('Server={0};Database=Microsoft.eShopOnContainers.Services.IdentityDb;User Id={1};Password={2}', variables['SqlHostName'], variables['SqlUsername'], variables['SqlPassword'])]
MarketingDbConnection: $[format('Server={0};Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id={1};Password={2}', variables['SqlHostName'], variables['SqlUsername'], variables['SqlPassword'])] MarketingDbConnection: $[format('Server={0};Database=Microsoft.eShopOnContainers.Services.MarketingDb;User Id={1};Password={2}', variables['SqlHostName'], variables['SqlUsername'], variables['SqlPassword'])]
OrderingDbConnection: $[format('Server={0};Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id={1};Password={2}', variables['SqlHostName'], variables['SqlUsername'], variables['SqlPassword'])] OrderingDbConnection: $[format('Server={0};Database=Microsoft.eShopOnContainers.Services.OrderingDb;User Id={1};Password={2}', variables['SqlHostName'], variables['SqlUsername'], variables['SqlPassword'])]
@ -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/openshift-templates/infrastructure/secrets-deploy-template.yml -p CATALOG_DB_CONNECTION_SECRET=$(CatalogDbConnection) -p IDENTITY_DB_CONNECTION_SECRET=12345 -p MARKETING_DB_CONNECTION_SECRET=12345 -p ORDERING_DB_CONNECTION_SECRET=12345 -p SQL_PASSWORD_SECRET=12345 -p WEBHOOKS_DB_CONNECTION_SECRET=12345 | oc apply -f-'
- script: 'oc process -f ./deploy/aro/openshift-templates/infrastructure/secrets-deploy-template.yml -p CATALOG_DB_CONNECTION_SECRET="$(CatalogDbConnection)" -p IDENTITY_DB_CONNECTION_SECRET=12345 -p MARKETING_DB_CONNECTION_SECRET=12345 -p ORDERING_DB_CONNECTION_SECRET=12345 -p SQL_PASSWORD_SECRET=12345 -p WEBHOOKS_DB_CONNECTION_SECRET=12345 | oc apply -f-'
failOnStderr: true failOnStderr: true
displayName: 'Secrets Deployment' displayName: 'Secrets Deployment'
- script: 'oc process -f ./deploy/aro/openshift-templates/infrastructure/rabbitmq-image-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-' - script: 'oc process -f ./deploy/aro/openshift-templates/infrastructure/rabbitmq-image-deploy-template.yml -p IMAGE_REGISTRY_PROJECT_NAME=$(SourceImageRegistryProjectName) | oc apply -f-'


Loading…
Cancel
Save