summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Callegari <mazzystr@gmail.com>2018-01-17 21:25:22 -0500
committerChris Callegari <mazzystr@gmail.com>2018-01-17 21:25:22 -0500
commitcfc277ce7c78fc6df69f0dbbdddf6c02bd8f7de0 (patch)
tree1198117589e0399eaa8d380f6b11f321a57425bc
parent3a7f1992410edd296ec1fa15dddd67d82a545f9f (diff)
downloadopenshift-cfc277ce7c78fc6df69f0dbbdddf6c02bd8f7de0.tar.gz
openshift-cfc277ce7c78fc6df69f0dbbdddf6c02bd8f7de0.tar.bz2
openshift-cfc277ce7c78fc6df69f0dbbdddf6c02bd8f7de0.tar.xz
openshift-cfc277ce7c78fc6df69f0dbbdddf6c02bd8f7de0.zip
Fix to master-internal elb scheme
-rw-r--r--roles/openshift_aws/defaults/main.yml2
-rw-r--r--roles/openshift_aws/tasks/elb.yml2
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_aws/defaults/main.yml b/roles/openshift_aws/defaults/main.yml
index efd2468b2..2edf50c14 100644
--- a/roles/openshift_aws/defaults/main.yml
+++ b/roles/openshift_aws/defaults/main.yml
@@ -59,7 +59,7 @@ openshift_aws_elb_name_dict:
external: "{{ openshift_aws_elb_basename }}-infra"
openshift_aws_elb_idle_timout: 400
-openshift_aws_elb_scheme: internet-facing
+
openshift_aws_elb_cert_arn: ''
openshift_aws_elb_dict:
diff --git a/roles/openshift_aws/tasks/elb.yml b/roles/openshift_aws/tasks/elb.yml
index 5d371ec7a..6f0028a3d 100644
--- a/roles/openshift_aws/tasks/elb.yml
+++ b/roles/openshift_aws/tasks/elb.yml
@@ -15,7 +15,7 @@
- "{{ subnetout.subnets[0].id }}"
health_check: "{{ openshift_aws_elb_health_check }}"
listeners: "{{ item.value }}"
- scheme: "{{ openshift_aws_elb_scheme }}"
+ scheme: "{{ (item.key == 'internal') | ternary('internal','internet-facing') }}"
tags: "{{ openshift_aws_elb_tags }}"
wait: True
register: new_elb