From a103ed7c07b63855617d78d1615c9d6cb6615db8 Mon Sep 17 00:00:00 2001
From: Mark Goddard <mark@stackhpc.com>
Date: Fri, 15 Mar 2019 15:22:54 +0000
Subject: [PATCH] Use service-specific _install_type variables in wsgi scripts

Change-Id: I0c31ad353e1fb764bc8e826cda5c3d092623f44b
---
 ansible/roles/aodh/templates/wsgi-aodh.conf.j2         | 2 +-
 ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2   | 2 +-
 ansible/roles/keystone/templates/wsgi-keystone.conf.j2 | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/ansible/roles/aodh/templates/wsgi-aodh.conf.j2 b/ansible/roles/aodh/templates/wsgi-aodh.conf.j2
index 4763595142..055d903bef 100644
--- a/ansible/roles/aodh/templates/wsgi-aodh.conf.j2
+++ b/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"
diff --git a/ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2 b/ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2
index 8cadbe6c25..e65b4f1191 100644
--- a/ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2
+++ b/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"
diff --git a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2
index 29a2c22fb5..9f30c58ec4 100644
--- a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2
+++ b/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