From 9f777f61534d7e92291cfa7c78f92625378333d6 Mon Sep 17 00:00:00 2001
From: Matthew Jones <matburt@redhat.com>
Date: Tue, 3 Jan 2017 13:59:12 -0500
Subject: [PATCH] Add some provisions for https into haproxy and the cluster

---
 tools/docker-compose-cluster.yml          |  1 +
 tools/docker-compose/haproxy.cfg          | 12 ++++++++++++
 tools/docker-compose/start_development.sh |  9 ---------
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/tools/docker-compose-cluster.yml b/tools/docker-compose-cluster.yml
index c04e8e275c..788d7d4af6 100644
--- a/tools/docker-compose-cluster.yml
+++ b/tools/docker-compose-cluster.yml
@@ -10,6 +10,7 @@ services:
       - "tower_3"
     ports:
       - "8013:8013"
+      - "8043:8043"
       - "1936:1936"
       - "5555:5555"
       - "15672:15672"
diff --git a/tools/docker-compose/haproxy.cfg b/tools/docker-compose/haproxy.cfg
index d7f0a40094..aa69bdd9d1 100644
--- a/tools/docker-compose/haproxy.cfg
+++ b/tools/docker-compose/haproxy.cfg
@@ -17,6 +17,11 @@ frontend localnodes
     mode http
     default_backend nodes
 
+frontend localnodes_ssl
+    bind *:8043
+    mode tcp
+    default_backend nodes_ssl
+
 frontend flower
     bind *:5555
     mode http
@@ -39,6 +44,13 @@ backend nodes
     server tower_2 tower_2:8013 check
     server tower_3 tower_3:8013 check
 
+backend nodes_ssl
+    mode tcp
+    balance roundrobin
+    server tower_1 tower_1:8043
+    server tower_2 tower_2:8043
+    server tower_3 tower_3:8043
+
 backend flower_nodes
     mode http
     balance roundrobin
diff --git a/tools/docker-compose/start_development.sh b/tools/docker-compose/start_development.sh
index b6fe94e854..ee94888431 100755
--- a/tools/docker-compose/start_development.sh
+++ b/tools/docker-compose/start_development.sh
@@ -24,15 +24,6 @@ else
 fi
 
 cp -nR /tmp/ansible_tower.egg-info /tower_devel/ || true
-
-# Check if we need to build dependencies
-#if [ -f "awx/lib/.deps_built" ]; then
-#    echo "Skipping dependency build - remove awx/lib/.deps_built to force a rebuild"
-#else
-#SWIG_FEATURES="-cpperraswarn -includeall -D__`uname -m`__ -I/usr/include/openssl" make requirements_dev
-#    touch awx/lib/.deps_built
-#fi
-
 cp /tmp/ansible-tower.egg-link /venv/tower/lib/python2.7/site-packages/ansible-tower.egg-link
 
 # Tower bootstrapping