From f80f78bf63ea55669af26902f1b71a661e8ebe0d Mon Sep 17 00:00:00 2001
From: Andy McCrae <andy.mccrae@gmail.com>
Date: Mon, 9 Jan 2017 14:55:39 +0000
Subject: [PATCH] Allow Apache ports to be specified per VHost

With more services moving to an Apache2 model, having a ports.conf file
becomes unmanageable - we should instead add the Listen line to each
Vhost and set a blank "ports.conf".

Change-Id: I58b12b799d15ad84e1c40125aba492109cdcb130
---
 templates/keystone-httpd.conf.j2 | 2 ++
 templates/keystone-ports.conf.j2 | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/templates/keystone-httpd.conf.j2 b/templates/keystone-httpd.conf.j2
index 750e8c55..cc821700 100644
--- a/templates/keystone-httpd.conf.j2
+++ b/templates/keystone-httpd.conf.j2
@@ -1,5 +1,6 @@
 # {{ ansible_managed }}
 
+Listen {{ keystone_service_port }}
 <VirtualHost *:{{ keystone_service_port }}>
 {% if keystone_mod_wsgi_enabled | bool -%}
     WSGIDaemonProcess     keystone-service user={{ keystone_system_user_name }} group={{ keystone_system_group_name }} processes={{ keystone_wsgi_processes }} threads={{ keystone_wsgi_threads }} display-name=%{GROUP} python-path={{ keystone_bin | dirname }}/lib/python2.7/site-packages
@@ -69,6 +70,7 @@
 {% endif %}
 </VirtualHost>
 
+Listen {{ keystone_admin_port }}
 <VirtualHost *:{{ keystone_admin_port }}>
 {% if keystone_mod_wsgi_enabled | bool -%}
     WSGIDaemonProcess     keystone-admin user={{ keystone_system_user_name }} group={{ keystone_system_group_name }} processes={{ keystone_wsgi_processes }} threads={{ keystone_wsgi_threads }} display-name=%{GROUP} python-path={{ keystone_bin | dirname }}/lib/python2.7/site-packages
diff --git a/templates/keystone-ports.conf.j2 b/templates/keystone-ports.conf.j2
index 35891dc1..3c32de37 100644
--- a/templates/keystone-ports.conf.j2
+++ b/templates/keystone-ports.conf.j2
@@ -1,4 +1,6 @@
 # {{ ansible_managed }}
 
-Listen {{ keystone_service_port }}
-Listen {{ keystone_admin_port }}
+# We place a blank file here
+# Listen commands happen inside the individual VHost files
+# This allows for multiple services VHosts to exist without
+# overwriting Listen lines.