From 29f7c0624ae14f91dd433bf6928b6817e79e0dea Mon Sep 17 00:00:00 2001
From: Markos Chandras <mchandras@suse.de>
Date: Thu, 20 Sep 2018 14:02:45 +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
Change-Id: I24b1afd41618bf5c090bc28a5514fd67d940824c
---
 meta/main.yml       | 4 +---
 vars/redhat-7.yml   | 1 -
 vars/suse.yml       | 1 -
 vars/ubuntu.yml     | 1 -
 zuul.d/project.yaml | 2 ++
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/meta/main.yml b/meta/main.yml
index f4822baf..64184916 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/redhat-7.yml b/vars/redhat-7.yml
index 15cae2fc..c814712a 100644
--- a/vars/redhat-7.yml
+++ b/vars/redhat-7.yml
@@ -59,7 +59,6 @@ neutron_devel_distro_packages:
 
 neutron_service_distro_packages:
   - python-cliff
-  - python-keystonemiddleware
   - openstack-neutron
   - openstack-neutron-ml2
   - openstack-neutron-macvtap-agent
diff --git a/vars/suse.yml b/vars/suse.yml
index 9006df8c..f9bb0fa8 100644
--- a/vars/suse.yml
+++ b/vars/suse.yml
@@ -75,7 +75,6 @@ neutron_devel_distro_packages:
 
 neutron_service_distro_packages:
   - python-cliff
-  - python-keystonemiddleware
   - openstack-neutron
   - openstack-neutron-dhcp-agent
   - openstack-neutron-l3-agent
diff --git a/vars/ubuntu.yml b/vars/ubuntu.yml
index 623e1513..f5ea3d21 100644
--- a/vars/ubuntu.yml
+++ b/vars/ubuntu.yml
@@ -72,7 +72,6 @@ neutron_devel_distro_packages:
 
 neutron_service_distro_packages:
   - python-cliff
-  - python-keystonemiddleware
   - neutron-server
   - neutron-dhcp-agent
   - neutron-l2gateway-agent
diff --git a/zuul.d/project.yaml b/zuul.d/project.yaml
index e757757f..6c2d0b58 100644
--- a/zuul.d/project.yaml
+++ b/zuul.d/project.yaml
@@ -38,6 +38,7 @@
         - openstack-ansible-functional-distro_install-centos-7:
             voting: false
         - openstack-ansible-functional-distro_install-opensuse-423
+        - openstack-ansible-functional-distro_install-opensuse-150
     gate:
       jobs:
         - openstack-ansible-ovs-ubuntu-xenial
@@ -48,3 +49,4 @@
         - openstack-ansible-odl-sfc-ubuntu-xenial
         - openstack-ansible-functional-distro_install-ubuntu-xenial
         - openstack-ansible-functional-distro_install-opensuse-423
+        - openstack-ansible-functional-distro_install-opensuse-150