network assignments

bottkars · Jan 3, 2019 · 86a80f2 · 86a80f2
1 parent 55a0f8b
commit 86a80f2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git 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
@@ -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