openstack/kolla-ansible
Code Issues Proposed changes

Fix ubuntu binary deploys

Browse Source 
1. The Keystone WSGI scripts don't have a python3- prefix, although they
   are using python 3.

2. The Placement WSGI script doesn't have a python3- prefix, although it
   is using python 3.

Depends-On: https://review.openstack.org/651327
Change-Id: I805df8f85634edea8322495ca73897d44967cfe6
Closes-Bug: #1823989
This commit is contained in:
Mark Goddard 2019-04-09 15:52:08 +00:00
parent 5e4c5e3d6c
commit d62ccca3e0
2 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,8 +1,8 @@
{% set keystone_log_dir = '/var/log/kolla/keystone' %}
{% if keystone_install_type == 'binary' %}
{% set python_path = '/usr/lib/python3/dist-packages' if kolla_base_distro == 'ubuntu' else '/usr/lib/python2.7/site-packages' %}
{% set python_path = '/usr/lib/python3/dist-packages' if kolla_base_distro == 'ubuntu' else '/usr/lib/python2.7/site-packages' %}
{% else %}
{% set python_path = '/var/lib/kolla/venv/lib/python2.7/site-packages' %}
{% set python_path = '/var/lib/kolla/venv/lib/python2.7/site-packages' %}
{% endif %}
{% set binary_path = '/usr/bin' if keystone_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
Listen {{ api_interface_address }}:{{ keystone_public_listen_port }}
@ -24,11 +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 keystone_install_type == 'binary' and kolla_base_distro == 'ubuntu' %}
WSGIScriptAlias / {{ binary_path }}/python3-keystone-wsgi-public
{% else %}
WSGIScriptAlias / {{ binary_path }}/keystone-wsgi-public
{% endif %}
WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On
<IfVersion >= 2.4>
@ -42,11 +38,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 keystone_install_type == 'binary' and kolla_base_distro == 'ubuntu' %}
WSGIScriptAlias / {{ binary_path }}/python3-keystone-wsgi-admin
{% else %}
WSGIScriptAlias / {{ binary_path }}/keystone-wsgi-admin
{% endif %}
WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On
<IfVersion >= 2.4>

8
ansible/roles/placement/templates/placement-api-wsgi.conf.j2
View File

@ -15,11 +15,7 @@ TraceEnable off
<VirtualHost *:{{ placement_api_listen_port }}>
WSGIDaemonProcess placement-api processes={{ openstack_service_workers }} threads=1 user=placement group=placement display-name=%{GROUP} python-path={{ python_path }}
WSGIProcessGroup placement-api
{% if placement_install_type == 'binary' and kolla_base_distro == 'ubuntu' %}
WSGIScriptAlias / {{ wsgi_directory }}/python3-placement-api
{% else %}
WSGIScriptAlias / {{ wsgi_directory }}/placement-api
{% endif %}
WSGIApplicationGroup %{GLOBAL}
WSGIPassAuthorization On
<IfVersion >= 2.4>
@ -29,11 +25,7 @@ TraceEnable off
LogFormat "%{X-Forwarded-For}i %l %u %t \"%r\" %>s %b %D \"%{Referer}i\" \"%{User-Agent}i\"" logformat
CustomLog "{{ log_dir }}/placement-api-access.log" logformat
<Directory {{ wsgi_directory }}>
{% if placement_install_type == 'binary' and kolla_base_distro == 'ubuntu' %}
<Files python3-placement-api>
{% else %}
<Files placement-api>
{% endif %}
Require all granted
</Files>
</Directory>