From b6fa5989b99f27e86ec4d60e536e0ce50ad1f3d0 Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Thu, 20 Sep 2018 14:00:53 +0100
Subject: [PATCH] SUSE: Add support for openSUSE Leap 15

This also removes python-keystonemiddleware from the distro packages
since anything that needs it should pull it as a dependency.

Depends-On: https://review.openstack.org/604473
Depends-On: https://review.openstack.org/604286
Change-Id: I8398b70fc7e371d163bed8bed8fc11f50c521e28
---
 meta/main.yml       | 4 +---
 vars/suse.yml       | 5 ++---
 zuul.d/project.yaml | 2 ++
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/meta/main.yml b/meta/main.yml
index b092fe8b..f334a714 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -29,9 +29,7 @@ galaxy_info:
         - 7
     - name: opensuse
       versions:
-        - 42.1
-        - 42.2
-        - 42.3
+        - all
   categories:
     - cloud
     - python
diff --git a/vars/suse.yml b/vars/suse.yml
index ce386227..8546471d 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -46,7 +46,6 @@ nova_service_distro_packages:
   - openstack-nova-scheduler
   - openstack-nova-serialproxy
   - openstack-nova-vncproxy
-  - python-keystonemiddleware
   - python-memcached
   - python-novaclient
   - python-PyMySQL
@@ -97,8 +96,8 @@ nova_compute_kvm_distro_packages:
   - sysfsutils
 
 nova_compute_kvm_packages_to_symlink:
-  - libvirt-python
-  - python-libguestfs
+  - "{{ (ansible_distribution_version is version ('42', '>=')) | ternary('libvirt-python', 'python2-libvirt-python') }}"
+  - "{{ (ansible_distribution_version is version ('42', '>=')) | ternary('python-libguestfs', 'python2-libguestfs') }}"
 
 nova_compute_ksm_packages:
   - qemu-ksm
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index 0b6c4504..00638f0d 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -26,8 +26,10 @@
         # NOTE(hwoarang) xenial does not currently work. It needs investigation
         - openstack-ansible-functional-distro_install-ubuntu-xenial:
             voting: false
+        - openstack-ansible-functional-distro_install-opensuse-150
     gate:
       jobs:
         - openstack-ansible-lxd-ubuntu-xenial
         - openstack-ansible-functional-distro_install-centos-7
         - openstack-ansible-functional-distro_install-opensuse-423
+        - openstack-ansible-functional-distro_install-opensuse-150