summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenny Woodson <kwoodson@redhat.com>2018-01-24 11:49:16 -0500
committerGitHub <noreply@github.com>2018-01-24 11:49:16 -0500
commit1871fbc797b236dbb374a0027ce5cd085b0c9361 (patch)
tree38b8d46033eef0f8128416fa33aa1be1b8e4a644
parent0344a8f71af49cdf3827ccf6be339097369c12f7 (diff)
parentcfc277ce7c78fc6df69f0dbbdddf6c02bd8f7de0 (diff)
downloadopenshift-1871fbc797b236dbb374a0027ce5cd085b0c9361.tar.gz
openshift-1871fbc797b236dbb374a0027ce5cd085b0c9361.tar.bz2
openshift-1871fbc797b236dbb374a0027ce5cd085b0c9361.tar.xz
openshift-1871fbc797b236dbb374a0027ce5cd085b0c9361.zip
Merge pull request #6767 from mazzystr/fix-master-internal-elb
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 a729e8dbd..5053823b0 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