From a6ae31c226984bb9dd66b43a5e9d6348f49f2e2b Mon Sep 17 00:00:00 2001 From: MinSeok Kim Date: Wed, 9 Jan 2019 23:00:18 +0900 Subject: [PATCH 1/3] [minseok]fix router-web-lb,brain-ssh-proxy-lb in ert --- install-pcf/azure/pipeline.yml | 1 + tasks/config-ert/task.sh | 9 +++++++++ tasks/config-ert/task.yml | 1 + 3 files changed, 11 insertions(+) diff --git a/install-pcf/azure/pipeline.yml b/install-pcf/azure/pipeline.yml index cf791d787..8f2dd9be8 100644 --- a/install-pcf/azure/pipeline.yml +++ b/install-pcf/azure/pipeline.yml @@ -488,6 +488,7 @@ jobs: HAPROXY_FLOATING_IPS: "" OPSMAN_CLIENT_ID: "" OPSMAN_CLIENT_SECRET: "" + AZURE_TERRAFORM_PREFIX: {{azure_terraform_prefix}} ########################### ## Job - Deploy ERT ## ########################### diff --git a/tasks/config-ert/task.sh b/tasks/config-ert/task.sh index 4093540d7..46ececbaf 100755 --- a/tasks/config-ert/task.sh +++ b/tasks/config-ert/task.sh @@ -560,6 +560,15 @@ cf_resources=$( | + if $iaas == "azure" then + .router |= . + { "elb_names": ["\($AZURE_TERRAFORM_PREFIX)-web-lb"] } + | .diego_brain |= . + { "elb_names": ["\($AZURE_TERRAFORM_PREFIX)-ssh-proxy-lb"] } + else + . + end + + | + # NSX LBs if $tcp_router_nsx_lb_edge_name != "" then diff --git a/tasks/config-ert/task.yml b/tasks/config-ert/task.yml index 0be068f44..de80bb4ff 100644 --- a/tasks/config-ert/task.yml +++ b/tasks/config-ert/task.yml @@ -131,6 +131,7 @@ params: POE_SSL_KEY3: OPSMAN_CLIENT_ID: OPSMAN_CLIENT_SECRET: + AZURE_TERRAFORM_PREFIX: inputs: - name: pcf-pipelines From 43cd33402edf943fe9c135ac9b913aed212edf69 Mon Sep 17 00:00:00 2001 From: MinSeok Kim Date: Wed, 9 Jan 2019 23:07:04 +0900 Subject: [PATCH 2/3] [minseok]fix router-web-lb,brain-ssh-proxy-lb in ert --- tasks/config-ert/task.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/tasks/config-ert/task.sh b/tasks/config-ert/task.sh index 46ececbaf..060f9d62f 100755 --- a/tasks/config-ert/task.sh +++ b/tasks/config-ert/task.sh @@ -538,6 +538,7 @@ cf_resources=$( --arg mysql_nsx_lb_pool_name "${MYSQL_NSX_LB_POOL_NAME}" \ --arg mysql_nsx_lb_security_group "${MYSQL_NSX_LB_SECURITY_GROUP}" \ --arg mysql_nsx_lb_port "${MYSQL_NSX_LB_PORT}" \ + --arg AZURE_TERRAFORM_PREFIX "${AZURE_TERRAFORM_PREFIX}" \ --argjson job_resource_config "${JOB_RESOURCE_CONFIG}" \ ' $job_resource_config From 68f0b4fb5dc814541dbdacddaaa58906869a1b4f Mon Sep 17 00:00:00 2001 From: MinSeok Kim Date: Wed, 9 Jan 2019 23:25:15 +0900 Subject: [PATCH 3/3] [minseok]fix tcp-lb in ert --- tasks/config-ert/task.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tasks/config-ert/task.sh b/tasks/config-ert/task.sh index 060f9d62f..2752b049b 100755 --- a/tasks/config-ert/task.sh +++ b/tasks/config-ert/task.sh @@ -538,7 +538,7 @@ cf_resources=$( --arg mysql_nsx_lb_pool_name "${MYSQL_NSX_LB_POOL_NAME}" \ --arg mysql_nsx_lb_security_group "${MYSQL_NSX_LB_SECURITY_GROUP}" \ --arg mysql_nsx_lb_port "${MYSQL_NSX_LB_PORT}" \ - --arg AZURE_TERRAFORM_PREFIX "${AZURE_TERRAFORM_PREFIX}" \ + --arg azure_terraform_prefix "${AZURE_TERRAFORM_PREFIX}" \ --argjson job_resource_config "${JOB_RESOURCE_CONFIG}" \ ' $job_resource_config @@ -562,8 +562,9 @@ cf_resources=$( | if $iaas == "azure" then - .router |= . + { "elb_names": ["\($AZURE_TERRAFORM_PREFIX)-web-lb"] } - | .diego_brain |= . + { "elb_names": ["\($AZURE_TERRAFORM_PREFIX)-ssh-proxy-lb"] } + .router |= . + { "elb_names": ["\($azure_terraform_prefix)-web-lb"] } + | .diego_brain |= . + { "elb_names": ["\($azure_terraform_prefix)-ssh-proxy-lb"] } + | .tcp_router |= . + { "elb_names": ["\($azure_terraform_prefix)-tcp-lb"] } else . end