Use service-specific _install_type variables in wsgi scripts

Change-Id: I0c31ad353e1fb764bc8e826cda5c3d092623f44b
This commit is contained in:
Mark Goddard 2019-03-15 15:22:54 +00:00
parent 2fc6d4cfc5
commit a103ed7c07
3 changed files with 4 additions and 4 deletions

View File

@ -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"

View File

@ -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"

View File

@ -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