From 86a80f2502178fe08876869989b7d3bb544d28c2 Mon Sep 17 00:00:00 2001 From: bottkars Date: Thu, 3 Jan 2019 17:50:49 +0100 Subject: [PATCH] network assignments --- scripts/deploy_pas.sh | 3 +-- scripts/om_init.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/deploy_pas.sh b/scripts/deploy_pas.sh index 7a2a28f..c64a11c 100644 --- a/scripts/deploy_pas.sh +++ b/scripts/deploy_pas.sh @@ -15,7 +15,6 @@ PCF_KEY_PEM=$(cat ${HOME_DIR}/${PCF_SUBDOMAIN_NAME}.${PCF_DOMAIN_NAME}.key | awk PCF_CERT_PEM=$(cat ${HOME_DIR}/${PCF_SUBDOMAIN_NAME}.${PCF_DOMAIN_NAME}.cert | awk '{printf "%s\\r\\n", $0}') PCF_CREDHUB_KEY="01234567890123456789" PRODUCT_NAME=cf -PCF_PAS_NETWORK="pcf-deployment-network" PCF_APPS_DOMAIN="apps.${PCF_SUBDOMAIN_NAME}.${PCF_DOMAIN_NAME}" PCF_SYSTEM_DOMAIN="sys.${PCF_SUBDOMAIN_NAME}.${PCF_DOMAIN_NAME}" PCF_WEB_LB="${ENV_NAME}-web-lb" @@ -92,7 +91,7 @@ om --skip-ssl-validation \ echo $(date) end staging PAS cat << EOF > vars.yaml -pcf_deployment_network: ${PCF_PAS_NETWORK} +pcf_pas_network: ${ENV_NAME}-pas-subnet pcf_system_domain: ${PCF_SYSTEM_DOMAIN} pcf_apps_domain: ${PCF_APPS_DOMAIN} pcf_notifications_email: ${PCF_NOTIFICATIONS_EMAIL} diff --git a/scripts/om_init.sh b/scripts/om_init.sh index 61b7b6c..9df874b 100644 --- a/scripts/om_init.sh +++ b/scripts/om_init.sh @@ -66,7 +66,7 @@ ssh_public_key: ${SSH_PUBLIC_KEY} ssh_private_key: ${SSH_PRIVATE_KEY} ntp_servers_string: 'time.windows.com' infrastructure-subnet: "${ENV_NAME}-virtual-network/${ENV_NAME}-infrastructure-subnet" -pas-subnet: "${ENV_NAME}-virtual-network/${ENV_NAME}-services-subnet" +pas-subnet: "${ENV_NAME}-virtual-network/${ENV_NAME}-pas-subnet" services-subnet: "${ENV_NAME}-virtual-network/${ENV_NAME}-services-subnet" EOF