diff --git a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 index 9f30c58ec4d4c63d92c08a9d9132e41d67e2ede5..3c3816ceebef75a47385add123f7cd01752843c6 100644 --- a/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 +++ b/ansible/roles/keystone/templates/wsgi-keystone.conf.j2 @@ -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> diff --git a/ansible/roles/placement/templates/placement-api-wsgi.conf.j2 b/ansible/roles/placement/templates/placement-api-wsgi.conf.j2 index 60fd5a370693423fb5d8d9fab27212bd9979d313..5373d95a08dbb87d5aa8dd0b78ff2beb2272d794 100644 --- a/ansible/roles/placement/templates/placement-api-wsgi.conf.j2 +++ b/ansible/roles/placement/templates/placement-api-wsgi.conf.j2 @@ -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>