Merge "Use a better process name for httpd subprocess"

ansible/roles/cinder/templates/cinder-api.json.j2

@@ -1,7 +1,7 @@
 {% set cinder_cmd = 'apache2' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd' %}
 {% set cinder_dir = 'apache2/conf-enabled' if kolla_base_distro in ['ubuntu', 'debian'] else 'httpd/conf.d' %}
 {
-    "command": "{{ cinder_cmd }} -DFOREGROUND",
+    "command": "/usr/sbin/{{ cinder_cmd }} -DFOREGROUND",
     "config_files": [
         {
             "source": "{{ container_config_directory }}/cinder.conf",

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

@@ -17,7 +17,7 @@ LogLevel info
 {% endif %}
 
 <VirtualHost *:{{ cinder_api_listen_port }}>
-    WSGIDaemonProcess cinder-api processes={{ openstack_service_workers }} threads=1 user=cinder group=cinder display-name=%{GROUP}
+    WSGIDaemonProcess cinder-api processes={{ openstack_service_workers }} threads=1 user=cinder group=cinder display-name=cinder-api
     WSGIProcessGroup cinder-api
     WSGIScriptAlias / /var/www/cgi-bin/cinder/cinder-wsgi
     WSGIApplicationGroup %{GLOBAL}

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

@@ -17,7 +17,7 @@ LogLevel info
 {% endif %}
 
 <VirtualHost *:{{ freezer_api_port }}>
-    WSGIDaemonProcess freezer-api processes={{ openstack_service_workers }} threads=1 user=freezer display-name=%{GROUP}
+    WSGIDaemonProcess freezer-api processes={{ openstack_service_workers }} threads=1 user=freezer display-name=freezer-api
     WSGIProcessGroup freezer-api
     WSGIApplicationGroup %{GLOBAL}
     WSGIScriptAlias / {{ python_path }}/freezer_api/cmd/wsgi.py

ansible/roles/heat/templates/wsgi-heat-api-cfn.conf.j2

@@ -28,7 +28,7 @@ CustomLog "{{ heat_log_dir }}/apache-cfn-access.log" common
 </IfModule>
 
 <VirtualHost *:{{ heat_api_cfn_listen_port }}>
-    WSGIDaemonProcess heat-api-cfn processes={{ openstack_service_workers }} threads=1 user=heat group=heat display-name=%{GROUP}
+    WSGIDaemonProcess heat-api-cfn processes={{ openstack_service_workers }} threads=1 user=heat group=heat display-name=heat-api-cfn
     WSGIProcessGroup heat-api-cfn
     WSGIScriptAlias / {{ binary_path }}/heat-wsgi-api-cfn
     WSGIApplicationGroup %{GLOBAL}

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

@@ -28,7 +28,7 @@ CustomLog "{{ heat_log_dir }}/apache-access.log" common
 </IfModule>
 
 <VirtualHost *:{{ heat_api_listen_port }}>
-    WSGIDaemonProcess heat-api processes={{ openstack_service_workers }} threads=1 user=heat group=heat display-name=%{GROUP}
+    WSGIDaemonProcess heat-api processes={{ openstack_service_workers }} threads=1 user=heat group=heat display-name=heat-api
     WSGIProcessGroup heat-api
     WSGIScriptAlias / {{ binary_path }}/heat-wsgi-api
     WSGIApplicationGroup %{GLOBAL}

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

@@ -20,7 +20,7 @@ TraceEnable off
     CustomLog /var/log/kolla/horizon/horizon-access.log logformat
 
     WSGIScriptReloading On
-    WSGIDaemonProcess horizon-http processes={{ horizon_wsgi_processes }} threads={{ horizon_wsgi_threads }} user=horizon group=horizon display-name=%{GROUP}
+    WSGIDaemonProcess horizon-http processes={{ horizon_wsgi_processes }} threads={{ horizon_wsgi_threads }} user=horizon group=horizon display-name=horizon
     WSGIProcessGroup horizon-http
 {% if kolla_base_distro in ['debian'] and horizon_install_type == 'binary' %}
     WSGIScriptAlias / {{ python_path }}/wsgi.py

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

@@ -31,7 +31,7 @@ LogLevel info
 {% endif %}
 
 <VirtualHost *:{{ ironic_api_listen_port }}>
-    WSGIDaemonProcess ironic-api processes={{ openstack_service_workers }} threads=1 user=ironic group=ironic display-name=%{GROUP}
+    WSGIDaemonProcess ironic-api processes={{ openstack_service_workers }} threads=1 user=ironic group=ironic display-name=ironic-api
     WSGIProcessGroup ironic-api
     WSGIScriptAlias / {{ wsgi_directory }}/ironic-api-wsgi
     WSGIApplicationGroup %{GLOBAL}

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

@@ -34,7 +34,7 @@ LogLevel info
 
 
 <VirtualHost *:{{ keystone_public_listen_port }}>
-    WSGIDaemonProcess keystone-public processes={{ openstack_service_workers }} threads=1 user=keystone group=keystone display-name=%{GROUP}
+    WSGIDaemonProcess keystone-public processes={{ openstack_service_workers }} threads=1 user=keystone group=keystone display-name=keystone-public
     WSGIProcessGroup keystone-public
     WSGIScriptAlias / {{ binary_path }}/keystone-wsgi-public
     WSGIApplicationGroup %{GLOBAL}
@@ -99,7 +99,7 @@ LogLevel info
 </VirtualHost>
 
 <VirtualHost *:{{ keystone_admin_listen_port }}>
-    WSGIDaemonProcess keystone-admin processes={{ openstack_service_workers }} threads=1 user=keystone group=keystone display-name=%{GROUP}
+    WSGIDaemonProcess keystone-admin processes={{ openstack_service_workers }} threads=1 user=keystone group=keystone display-name=keystone-admin
     WSGIProcessGroup keystone-admin
     WSGIScriptAlias / {{ binary_path }}/keystone-wsgi-admin
     WSGIApplicationGroup %{GLOBAL}

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

@@ -32,7 +32,7 @@ LogLevel info
 {% endif %}
 
 <VirtualHost *:{{ nova_api_listen_port }}>
-    WSGIDaemonProcess nova-api processes={{ openstack_service_workers }} threads=1 user=nova group=nova display-name=%{GROUP}
+    WSGIDaemonProcess nova-api processes={{ openstack_service_workers }} threads=1 user=nova group=nova display-name=nova-api
     WSGIProcessGroup nova-api
     WSGIScriptAlias / {{ wsgi_directory }}/nova-api-wsgi
     WSGIApplicationGroup %{GLOBAL}
@@ -51,7 +51,7 @@ LogLevel info
 </VirtualHost>
 
 <VirtualHost *:{{ nova_metadata_listen_port }}>
-    WSGIDaemonProcess nova-metadata processes={{ openstack_service_workers }} threads=1 user=nova group=nova display-name=%{GROUP}
+    WSGIDaemonProcess nova-metadata processes={{ openstack_service_workers }} threads=1 user=nova group=nova display-name=nova-metadata-api
     WSGIProcessGroup nova-metadata
     WSGIScriptAlias / {{ wsgi_directory }}/nova-metadata-wsgi
     WSGIApplicationGroup %{GLOBAL}

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

@@ -19,7 +19,7 @@ LogLevel info
 {% endif %}
 
 <VirtualHost *:{{ placement_api_listen_port }}>
-    WSGIDaemonProcess placement-api processes={{ openstack_service_workers }} threads=1 user=placement group=placement display-name=%{GROUP}
+    WSGIDaemonProcess placement-api processes={{ openstack_service_workers }} threads=1 user=placement group=placement display-name=placement-api
     WSGIProcessGroup placement-api
     WSGIScriptAlias / {{ wsgi_directory }}/placement-api
     WSGIApplicationGroup %{GLOBAL}