openstack
/
openstack-ansible-os_keystone
Code Issues Proposed changes

Merge "Fix distro installs on Ubuntu"

This commit is contained in:
Zuul 2019-06-11 08:48:32 +00:00 committed by Gerrit Code Review
parent 6960c141e5 254a447ffe
commit e9718f14f3
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
templates/keystone-uwsgi.ini.j2
View File

@ -6,6 +6,9 @@ gid = {{ keystone_system_group_name }}
{% if keystone_install_method == 'source' %}
virtualenv = /openstack/venvs/keystone-{{ keystone_venv_tag }}
{% endif %}
{% if keystone_install_method == 'distro' and (ansible_os_family | lower) == 'debian' %}
plugin = python3
{% endif %}
wsgi-file = {{ keystone_bin }}/{{ item }}
http = :{{ keystone_uwsgi_ports[item]['http'] }}
socket = 127.0.0.1:{{ keystone_uwsgi_ports[item]['socket'] }}

4
vars/debian.yml
View File

@ -38,11 +38,11 @@ keystone_devel_distro_packages:
- python-dev
keystone_service_distro_packages:
- keystone
- python3-keystone
- python-systemd
- python3-systemd
- uwsgi
- uwsgi-plugin-python
- uwsgi-plugin-python3
keystone_apache_distro_packages:
- apache2