From: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
Date: Tue, 19 Mar 2019 19:46:41 +0000 (+0100)
Subject: teuthology: make zypper vars leap version specific
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F453%2Fhead;p=ceph-cm-ansible.git

teuthology: make zypper vars leap version specific

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
---

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_opensuse_leap_42.3.yml b/roles/teuthology/vars/zypper_opensuse_leap_42.3.yml
new file mode 100644
index 00000000..280a260c
--- /dev/null
+++ b/roles/teuthology/vars/zypper_opensuse_leap_42.3.yml
@@ -0,0 +1,22 @@
+---
+teuthology_extra_packages:
+  - beanstalkd
+  - git
+  - gcc
+  - libev-devel
+  - libffi48-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_systems.yml
deleted file mode 100644
index 280a260c..00000000
--- a/roles/teuthology/vars/zypper_systems.yml
+++ /dev/null
@@ -1,22 +0,0 @@
----
-teuthology_extra_packages:
-  - beanstalkd
-  - git
-  - gcc
-  - libev-devel
-  - libffi48-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"