openstack/openstack-ansible-os_keystone
Code Issues Proposed changes

Allow Apache ports to be specified per VHost

Browse Source 
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
This commit is contained in:
Andy McCrae 2017-01-09 14:55:39 +00:00
parent 2635e43c09
commit f80f78bf63
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
templates/keystone-httpd.conf.j2
View File

@ -1,5 +1,6 @@
# {{ ansible_managed }} # {{ ansible_managed }}
Listen {{ keystone_service_port }}
<VirtualHost *:{{ keystone_service_port }}> <VirtualHost *:{{ keystone_service_port }}>
{% if keystone_mod_wsgi_enabled | bool -%} {% 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 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 %} {% endif %}
</VirtualHost> </VirtualHost>
Listen {{ keystone_admin_port }}
<VirtualHost *:{{ keystone_admin_port }}> <VirtualHost *:{{ keystone_admin_port }}>
{% if keystone_mod_wsgi_enabled | bool -%} {% 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 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

6
templates/keystone-ports.conf.j2
View File

@ -1,4 +1,6 @@
# {{ ansible_managed }} # {{ ansible_managed }}
Listen {{ keystone_service_port }} # We place a blank file here
Listen {{ keystone_admin_port }} # Listen commands happen inside the individual VHost files
# This allows for multiple services VHosts to exist without
# overwriting Listen lines.