From 113d85d23b592855eb2bb5f8351d18db4ca1c5cf Mon Sep 17 00:00:00 2001
From: Ralf Haferkamp <rhafer@suse.com>
Date: Fri, 13 Sep 2019 16:54:49 +0200
Subject: [PATCH] Fix distro install on openSUSE

With Train (current master) openSUSE is switching the openstack packages
to use Python 3. This means that we need to use the python3 module for
uwsgi.

Change-Id: I0fcb9d6a1df8893f3f4e6593a1614611e6712418
---
 templates/keystone-uwsgi.ini.j2 | 2 +-
 vars/suse.yml                   | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/templates/keystone-uwsgi.ini.j2 b/templates/keystone-uwsgi.ini.j2
index a1b352fc..c4831e88 100644
--- a/templates/keystone-uwsgi.ini.j2
+++ b/templates/keystone-uwsgi.ini.j2
@@ -6,7 +6,7 @@ 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' %}
+{% if keystone_install_method == 'distro' and (ansible_os_family | lower) in ['debian', 'suse' ] %}
 plugin = python3
 {% endif %}
 wsgi-file = {{ keystone_bin }}/{{ item }}
diff --git a/vars/suse.yml b/vars/suse.yml
index 9c7c52a4..65cea06f 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -29,13 +29,12 @@ keystone_devel_distro_packages:
   - openldap2-devel
   - systemd-devel
   - pkg-config
-  - python-devel
+  - python3-devel
 
 keystone_service_distro_packages:
   - openstack-keystone
-  - python-systemd
   - uwsgi
-  - uwsgi-python
+  - uwsgi-python3
 
 keystone_apache_distro_packages:
   - apache2