From 4109fb430a78175eb0e711cae33da29b9dde8c39 Mon Sep 17 00:00:00 2001
From: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
Date: Tue, 19 Mar 2019 20:46:41 +0100
Subject: [PATCH] teuthology: make zypper vars leap version specific

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
---
 roles/teuthology/tasks/zypper_systems.yml     |  2 +-
 .../vars/zypper_opensuse_leap_15.0.yml        | 22 +++++++++++++++++++
 .../vars/zypper_opensuse_leap_15.1.yml        | 22 +++++++++++++++++++
 ...tems.yml => zypper_opensuse_leap_42.3.yml} |  0
 4 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 roles/teuthology/vars/zypper_opensuse_leap_15.0.yml
 create mode 100644 roles/teuthology/vars/zypper_opensuse_leap_15.1.yml
 rename roles/teuthology/vars/{zypper_systems.yml => zypper_opensuse_leap_42.3.yml} (100%)

diff --git a/roles/teuthology/tasks/zypper_systems.yml b/roles/teuthology/tasks/zypper_systems.yml
index b71cccf9..af641bae 100644
--- a/roles/teuthology/tasks/zypper_systems.yml
+++ b/roles/teuthology/tasks/zypper_systems.yml
@@ -1,6 +1,6 @@
 ---
 - name: Include package type specific vars.
-  include_vars: "zypper_systems.yml"
+  include_vars: "zypper_{{ ansible_distribution | lower | replace(' ', '_') }}_{{ ansible_distribution_version }}.yml"
   tags:
     - always
 
diff --git a/roles/teuthology/vars/zypper_opensuse_leap_15.0.yml b/roles/teuthology/vars/zypper_opensuse_leap_15.0.yml
new file mode 100644
index 00000000..793d54e7
--- /dev/null
+++ b/roles/teuthology/vars/zypper_opensuse_leap_15.0.yml
@@ -0,0 +1,22 @@
+---
+teuthology_extra_packages:
+  - beanstalkd
+  - git
+  - gcc
+  - libev-devel
+  - libffi-devel
+  - libmysqlclient-devel
+  - libopenssl-devel
+  - libvirt-devel
+  - libvirt-python
+  - libyaml-devel
+  - lsb-release
+  - nginx
+  - python-devel
+  - python-pip
+  - python-virtualenv
+  - qemu-tools
+
+#apache_service: apache2
+nginx_available: "/etc/nginx"
+nginx_enabled: "/etc/nginx/vhosts.d"
diff --git a/roles/teuthology/vars/zypper_opensuse_leap_15.1.yml b/roles/teuthology/vars/zypper_opensuse_leap_15.1.yml
new file mode 100644
index 00000000..793d54e7
--- /dev/null
+++ b/roles/teuthology/vars/zypper_opensuse_leap_15.1.yml
@@ -0,0 +1,22 @@
+---
+teuthology_extra_packages:
+  - beanstalkd
+  - git
+  - gcc
+  - libev-devel
+  - libffi-devel
+  - libmysqlclient-devel
+  - libopenssl-devel
+  - libvirt-devel
+  - libvirt-python
+  - libyaml-devel
+  - lsb-release
+  - nginx
+  - python-devel
+  - python-pip
+  - python-virtualenv
+  - qemu-tools
+
+#apache_service: apache2
+nginx_available: "/etc/nginx"
+nginx_enabled: "/etc/nginx/vhosts.d"
diff --git a/roles/teuthology/vars/zypper_systems.yml b/roles/teuthology/vars/zypper_opensuse_leap_42.3.yml
similarity index 100%
rename from roles/teuthology/vars/zypper_systems.yml
rename to roles/teuthology/vars/zypper_opensuse_leap_42.3.yml
-- 
2.47.3