Merge "Use service-specific _install_type variables in wsgi scripts"

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

@@ -27,7 +27,7 @@ TraceEnable off
   WSGIApplicationGroup %{GLOBAL}
   WSGIDaemonProcess aodh group=aodh processes={{ openstack_service_workers }} threads=1 user=aodh python-path={{ python_path }}
   WSGIProcessGroup aodh
-{% if kolla_install_type == 'binary' and kolla_base_distro == 'ubuntu' %}
+{% if aodh_install_type == 'binary' and kolla_base_distro == 'ubuntu' %}
   WSGIScriptAlias / "{{ binary_path }}/python3-aodh-api"
 {% else %}
   WSGIScriptAlias / "{{ binary_path }}/aodh-api"

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

@@ -18,7 +18,7 @@ TraceEnable off
   WSGIApplicationGroup %{GLOBAL}
   WSGIDaemonProcess gnocchi group=gnocchi processes={{ openstack_service_workers }} threads=1 user=gnocchi python-path={{ python_path }}
   WSGIProcessGroup gnocchi
-{% if kolla_install_type == 'binary' and kolla_base_distro == 'ubuntu' %}
+{% if gnocchi_install_type == 'binary' and kolla_base_distro == 'ubuntu' %}
   WSGIScriptAlias / "{{ wsgi_path }}/python3-gnocchi-api"
 {% else %}
   WSGIScriptAlias / "{{ wsgi_path }}/gnocchi-api"

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

@@ -24,7 +24,7 @@ TraceEnable off
 <VirtualHost *:{{ keystone_public_listen_port }}>
     WSGIDaemonProcess keystone-public processes={{ openstack_service_workers }} threads=1 user=keystone group=keystone display-name=%{GROUP} python-path={{ python_path }}
     WSGIProcessGroup keystone-public
-{% if kolla_install_type == 'binary' and kolla_base_distro == 'ubuntu' %}
+{% if keystone_install_type == 'binary' and kolla_base_distro == 'ubuntu' %}
     WSGIScriptAlias / {{ binary_path }}/python3-keystone-wsgi-public
 {% else %}
     WSGIScriptAlias / {{ binary_path }}/keystone-wsgi-public
@@ -42,7 +42,7 @@ TraceEnable off
 <VirtualHost *:{{ keystone_admin_listen_port }}>
     WSGIDaemonProcess keystone-admin processes={{ openstack_service_workers }} threads=1 user=keystone group=keystone display-name=%{GROUP} python-path={{ python_path }}
     WSGIProcessGroup keystone-admin
-{% if kolla_install_type == 'binary' and kolla_base_distro == 'ubuntu' %}
+{% if keystone_install_type == 'binary' and kolla_base_distro == 'ubuntu' %}
     WSGIScriptAlias / {{ binary_path }}/python3-keystone-wsgi-admin
 {% else %}
     WSGIScriptAlias / {{ binary_path }}/keystone-wsgi-admin