From 162fb60b2f606244d5acb302efee46f13709ee2e Mon Sep 17 00:00:00 2001
From: Andrei Stepanov <astepano@redhat.com>
Date: Apr 04 2018 16:24:54 +0000
Subject: Add distro_name/distro_name_ver. Add pkgs for beakerlib.


Signed-off-by: Andrei Stepanov <astepano@redhat.com>

---

diff --git a/roles/standard-test-beakerlib/defaults/main.yml b/roles/standard-test-beakerlib/defaults/main.yml
new file mode 100644
index 0000000..02a43f4
--- /dev/null
+++ b/roles/standard-test-beakerlib/defaults/main.yml
@@ -0,0 +1,8 @@
+---
+
+beakerlib_pkgs_req:
+  rhel_7: &rhel_7
+    - python-lxml
+  centos_7: *rhel_7
+  fedora:
+    - python2-lxml
diff --git a/roles/standard-test-beakerlib/tasks/main.yml b/roles/standard-test-beakerlib/tasks/main.yml
index 41a68a3..92222ca 100644
--- a/roles/standard-test-beakerlib/tasks/main.yml
+++ b/roles/standard-test-beakerlib/tasks/main.yml
@@ -23,14 +23,21 @@
     - restraint-rhts
     - rsync
 
+- debug:
+    msg: >
+      1 req pkgs for: {{ distro_name }}: {{ beakerlib_pkgs_req[distro_name] | default([]) }}
+      2 req pkgs for: {{ distro_name_ver }}: {{ beakerlib_pkgs_req[distro_name_ver] | default([]) }}
+    verbosity: 1
+
 - name: Install the beakerlib requirements to test environment
   package: name={{item}} state=latest
-  with_items:
-    - rsync
-    - findutils
-    - make
-    - python2-lxml
-    - libselinux-python
+  with_flattened:
+    - - rsync
+      - findutils
+      - make
+      - libselinux-python
+    - "{{ beakerlib_pkgs_req[distro_name_ver] | default([]) }}"
+    - "{{ beakerlib_pkgs_req[distro_name] | default([]) }}"
   when: not is_atomic
 
 - name: Put beakerlib binaries to test environment
diff --git a/roles/str-common/defaults/main.yml b/roles/str-common/defaults/main.yml
index 4e49707..9981d95 100644
--- a/roles/str-common/defaults/main.yml
+++ b/roles/str-common/defaults/main.yml
@@ -6,3 +6,7 @@ tenv_workdir: /var/str/
 remote_artifacts: /tmp/artifacts/
 test_runner_inventory_name: test-runner
 artifacts: "{{ lookup('env', 'TEST_ARTIFACTS')|default('./artifacts', true) }}"
+# distro_name: rhel, centos, fedora
+distro_name: "{{ansible_distribution|lower}}"
+# distro_name_ver: rhel_7, centos_7, fedora_22
+distro_name_ver: "{{ansible_distribution|lower}}_{{ansible_distribution_major_version}}"