openstack/kolla-ansible
Code Issues Proposed changes

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

Browse Source
This commit is contained in:
Zuul 2019-03-18 11:30:28 +00:00 committed by Gerrit Code Review
commit 949360642f
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/aodh/templates/wsgi-aodh.conf.j2
View File

@ -27,7 +27,7 @@ TraceEnable off
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIDaemonProcess aodh group=aodh processes={{ openstack_service_workers }} threads=1 user=aodh python-path={{ python_path }} WSGIDaemonProcess aodh group=aodh processes={{ openstack_service_workers }} threads=1 user=aodh python-path={{ python_path }}
WSGIProcessGroup aodh 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" WSGIScriptAlias / "{{ binary_path }}/python3-aodh-api"
{% else %} {% else %}
WSGIScriptAlias / "{{ binary_path }}/aodh-api" WSGIScriptAlias / "{{ binary_path }}/aodh-api"

2
ansible/roles/gnocchi/templates/wsgi-gnocchi.conf.j2
View File

@ -18,7 +18,7 @@ TraceEnable off
WSGIApplicationGroup %{GLOBAL} WSGIApplicationGroup %{GLOBAL}
WSGIDaemonProcess gnocchi group=gnocchi processes={{ openstack_service_workers }} threads=1 user=gnocchi python-path={{ python_path }} WSGIDaemonProcess gnocchi group=gnocchi processes={{ openstack_service_workers }} threads=1 user=gnocchi python-path={{ python_path }}
WSGIProcessGroup gnocchi 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" WSGIScriptAlias / "{{ wsgi_path }}/python3-gnocchi-api"
{% else %} {% else %}
WSGIScriptAlias / "{{ wsgi_path }}/gnocchi-api" WSGIScriptAlias / "{{ wsgi_path }}/gnocchi-api"

4
ansible/roles/keystone/templates/wsgi-keystone.conf.j2
View File

@ -24,7 +24,7 @@ TraceEnable off
<VirtualHost *:{{ keystone_public_listen_port }}> <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 }} WSGIDaemonProcess keystone-public processes={{ openstack_service_workers }} threads=1 user=keystone group=keystone display-name=%{GROUP} python-path={{ python_path }}
WSGIProcessGroup keystone-public 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 WSGIScriptAlias / {{ binary_path }}/python3-keystone-wsgi-public
{% else %} {% else %}
WSGIScriptAlias / {{ binary_path }}/keystone-wsgi-public WSGIScriptAlias / {{ binary_path }}/keystone-wsgi-public
@ -42,7 +42,7 @@ TraceEnable off
<VirtualHost *:{{ keystone_admin_listen_port }}> <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 }} WSGIDaemonProcess keystone-admin processes={{ openstack_service_workers }} threads=1 user=keystone group=keystone display-name=%{GROUP} python-path={{ python_path }}
WSGIProcessGroup keystone-admin 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 WSGIScriptAlias / {{ binary_path }}/python3-keystone-wsgi-admin
{% else %} {% else %}
WSGIScriptAlias / {{ binary_path }}/keystone-wsgi-admin WSGIScriptAlias / {{ binary_path }}/keystone-wsgi-admin