From cfc277ce7c78fc6df69f0dbbdddf6c02bd8f7de0 Mon Sep 17 00:00:00 2001
From: Chris Callegari <mazzystr@gmail.com>
Date: Wed, 17 Jan 2018 21:25:22 -0500
Subject: Fix to master-internal elb scheme

---
 roles/openshift_aws/defaults/main.yml | 2 +-
 roles/openshift_aws/tasks/elb.yml     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'roles/openshift_aws')

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
-- 
cgit v1.2.3