Merge "Security reinforce for apache server"

ansible/roles/aodh/templates/wsgi-aodh.conf.j2

@@ -1,6 +1,8 @@
 {% set python_path = '/usr/lib/python2.7/site-packages' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %}
 Listen {{ api_interface_address }}:{{ aodh_api_port }}
 
+ServerSignature Off
+ServerTokens Prod
 TraceEnable off
 
 <VirtualHost *:{{ aodh_api_port }}>

ansible/roles/cinder/templates/cinder-wsgi.conf.j2

@@ -1,6 +1,8 @@
 {% set python_path = '/usr/lib/python2.7/site-packages' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %}
 Listen {{ api_interface_address }}:{{ cinder_api_port }}
 
+ServerSignature Off
+ServerTokens Prod
 TraceEnable off
 
 <VirtualHost *:{{ cinder_api_port }}>

ansible/roles/cloudkitty/templates/wsgi-cloudkitty.conf.j2

@@ -1,6 +1,8 @@
 {% set python_path = '/usr/lib/python2.7/site-packages' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %}
 Listen {{ api_interface_address }}:{{ cloudkitty_api_port }}
 
+ServerSignature Off
+ServerTokens Prod
 TraceEnable off
 
 <VirtualHost *:{{ cloudkitty_api_port }}>

ansible/roles/freezer/templates/wsgi-freezer-api.conf.j2

@@ -2,6 +2,8 @@
 {% set python_path = '/usr/lib/python2.7/site-packages' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %}
 Listen {{ api_interface_address }}:{{ freezer_api_port }}
 
+ServerSignature Off
+ServerTokens Prod
 TraceEnable off
 
 <VirtualHost *:{{ freezer_api_port }}>

ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2

@@ -2,6 +2,8 @@
 {% set wsgi_path = '/usr/bin' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
 Listen {{ api_interface_address }}:{{ gnocchi_api_port }}
 
+ServerSignature Off
+ServerTokens Prod
 TraceEnable off
 
 <VirtualHost *:{{ gnocchi_api_port }}>

ansible/roles/horizon/templates/horizon.conf.j2

@@ -1,6 +1,8 @@
 {% set python_path = '/usr/share/openstack-dashboard' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %}
 Listen {{ api_interface_address }}:{{ horizon_port }}
 
+ServerSignature Off
+ServerTokens Prod
 TraceEnable off
 
 <VirtualHost *:{{ horizon_port }}>

ansible/roles/keystone/templates/wsgi-keystone.conf.j2

@@ -3,6 +3,8 @@
 Listen {{ api_interface_address }}:{{ keystone_public_port }}
 Listen {{ api_interface_address }}:{{ keystone_admin_port }}
 
+ServerSignature Off
+ServerTokens Prod
 TraceEnable off
 
 <VirtualHost *:{{ keystone_public_port }}>

ansible/roles/nova/templates/placement-api-wsgi.conf.j2

@@ -3,6 +3,8 @@
 {% set wsgi_directory = '/usr/bin' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
 Listen {{ api_interface_address }}:{{ placement_api_port }}
 
+ServerSignature Off
+ServerTokens Prod
 TraceEnable off
 
 <VirtualHost *:{{ placement_api_port }}>

ansible/roles/panko/templates/wsgi-panko.conf.j2

@@ -1,6 +1,8 @@
 {% set python_path = '/usr/lib/python2.7/site-packages' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %}
 Listen {{ api_interface_address }}:{{ panko_api_port }}
 
+ServerSignature Off
+ServerTokens Prod
 TraceEnable off
 
 <VirtualHost *:{{ panko_api_port }}>

ansible/roles/vitrage/templates/wsgi-vitrage.conf.j2

@@ -1,6 +1,10 @@
 {% set python_path = '/usr/lib/python2.7/site-packages' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %}
 Listen {{ hostvars[inventory_hostname]['ansible_' + api_interface]['ipv4']['address'] }}:{{ vitrage_api_port }}
 
+ServerSignature Off
+ServerTokens Prod
+TraceEnable off
+
 <VirtualHost *:{{ vitrage_api_port }}>
 
   ## Vhost docroot

ansible/roles/zun/templates/wsgi-zun.conf.j2

@@ -1,6 +1,8 @@
 {% set python_path = '/usr/lib/python2.7/site-packages' if kolla_install_type == 'binary' else '/var/lib/kolla/venv/lib/python2.7/site-packages' %}
 Listen {{ api_interface_address }}:{{ zun_api_port }}
 
+ServerSignature Off
+ServerTokens Prod
 TraceEnable off
 
 <VirtualHost *:{{ zun_api_port }}>