Merge "Fix ubuntu binary deploys"
This commit is contained in:
commit
afc3fc0ab2
|
@ -1,8 +1,8 @@
|
||||||
{% set keystone_log_dir = '/var/log/kolla/keystone' %}
|
{% set keystone_log_dir = '/var/log/kolla/keystone' %}
|
||||||
{% if keystone_install_type == 'binary' %}
|
{% 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 %}
|
{% 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 %}
|
{% endif %}
|
||||||
{% set binary_path = '/usr/bin' if keystone_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
|
{% set binary_path = '/usr/bin' if keystone_install_type == 'binary' else '/var/lib/kolla/venv/bin' %}
|
||||||
Listen {{ api_interface_address }}:{{ keystone_public_listen_port }}
|
Listen {{ api_interface_address }}:{{ keystone_public_listen_port }}
|
||||||
|
@ -24,11 +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 keystone_install_type == 'binary' and kolla_base_distro == 'ubuntu' %}
|
|
||||||
WSGIScriptAlias / {{ binary_path }}/python3-keystone-wsgi-public
|
|
||||||
{% else %}
|
|
||||||
WSGIScriptAlias / {{ binary_path }}/keystone-wsgi-public
|
WSGIScriptAlias / {{ binary_path }}/keystone-wsgi-public
|
||||||
{% endif %}
|
|
||||||
WSGIApplicationGroup %{GLOBAL}
|
WSGIApplicationGroup %{GLOBAL}
|
||||||
WSGIPassAuthorization On
|
WSGIPassAuthorization On
|
||||||
<IfVersion >= 2.4>
|
<IfVersion >= 2.4>
|
||||||
|
@ -42,11 +38,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 keystone_install_type == 'binary' and kolla_base_distro == 'ubuntu' %}
|
|
||||||
WSGIScriptAlias / {{ binary_path }}/python3-keystone-wsgi-admin
|
|
||||||
{% else %}
|
|
||||||
WSGIScriptAlias / {{ binary_path }}/keystone-wsgi-admin
|
WSGIScriptAlias / {{ binary_path }}/keystone-wsgi-admin
|
||||||
{% endif %}
|
|
||||||
WSGIApplicationGroup %{GLOBAL}
|
WSGIApplicationGroup %{GLOBAL}
|
||||||
WSGIPassAuthorization On
|
WSGIPassAuthorization On
|
||||||
<IfVersion >= 2.4>
|
<IfVersion >= 2.4>
|
||||||
|
|
|
@ -15,11 +15,7 @@ TraceEnable off
|
||||||
<VirtualHost *:{{ placement_api_listen_port }}>
|
<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 }}
|
WSGIDaemonProcess placement-api processes={{ openstack_service_workers }} threads=1 user=placement group=placement display-name=%{GROUP} python-path={{ python_path }}
|
||||||
WSGIProcessGroup placement-api
|
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
|
WSGIScriptAlias / {{ wsgi_directory }}/placement-api
|
||||||
{% endif %}
|
|
||||||
WSGIApplicationGroup %{GLOBAL}
|
WSGIApplicationGroup %{GLOBAL}
|
||||||
WSGIPassAuthorization On
|
WSGIPassAuthorization On
|
||||||
<IfVersion >= 2.4>
|
<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
|
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
|
CustomLog "{{ log_dir }}/placement-api-access.log" logformat
|
||||||
<Directory {{ wsgi_directory }}>
|
<Directory {{ wsgi_directory }}>
|
||||||
{% if placement_install_type == 'binary' and kolla_base_distro == 'ubuntu' %}
|
|
||||||
<Files python3-placement-api>
|
|
||||||
{% else %}
|
|
||||||
<Files placement-api>
|
<Files placement-api>
|
||||||
{% endif %}
|
|
||||||
Require all granted
|
Require all granted
|
||||||
</Files>
|
</Files>
|
||||||
</Directory>
|
</Directory>
|
||||||
|
|
Loading…
Reference in New Issue