From c23eeca51b5f7e74794008e776594e1a08e38813 Mon Sep 17 00:00:00 2001
From: Bruno Goncalves <bgoncalv@redhat.com>
Date: Jun 03 2019 12:26:42 +0000
Subject: Rename role defaults to vars


This should fix an issue when multiple roles are used and the variables are overwritten by the next role.

---

diff --git a/roles/standard-test-basic/defaults/main.yml b/roles/standard-test-basic/defaults/main.yml
deleted file mode 100644
index 2abd1ec..0000000
--- a/roles/standard-test-basic/defaults/main.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-# This care about this lists will take str-common-init
-role_pkgs_req:
-  - rsync
diff --git a/roles/standard-test-basic/vars/main.yml b/roles/standard-test-basic/vars/main.yml
new file mode 100644
index 0000000..2abd1ec
--- /dev/null
+++ b/roles/standard-test-basic/vars/main.yml
@@ -0,0 +1,3 @@
+# This care about this lists will take str-common-init
+role_pkgs_req:
+  - rsync
diff --git a/roles/standard-test-beakerlib/defaults/main.yml b/roles/standard-test-beakerlib/defaults/main.yml
deleted file mode 100644
index dc55b2b..0000000
--- a/roles/standard-test-beakerlib/defaults/main.yml
+++ /dev/null
@@ -1,29 +0,0 @@
----
-
-beakerlib_pkgs_req:
-  rhel_7: &rhel_7
-    - python-lxml
-    - libselinux-python
-  centos_7: *rhel_7
-  fedora:
-    - python2-lxml
-  fedora_27:
-    - libselinux-python3
-  fedora_28:
-    - python3-libselinux
-  rhel_8:
-    - python3-libselinux
-
-makefile_pkgs_req1: []
-makefile_pkgs_req2: []
-
-# This care about this lists will take str-common-init
-role_pkgs_req:
-  - beakerlib
-  - rsync
-  - make
-  - beakerlib-libraries
-  - "{{ beakerlib_pkgs_req[distro_name_ver] | default([]) }}"
-  - "{{ beakerlib_pkgs_req[distro_name] | default([]) }}"
-
-beakerlib_libraries_path: /usr/share/beakerlib-libraries
diff --git a/roles/standard-test-beakerlib/vars/main.yml b/roles/standard-test-beakerlib/vars/main.yml
new file mode 100644
index 0000000..dc55b2b
--- /dev/null
+++ b/roles/standard-test-beakerlib/vars/main.yml
@@ -0,0 +1,29 @@
+---
+
+beakerlib_pkgs_req:
+  rhel_7: &rhel_7
+    - python-lxml
+    - libselinux-python
+  centos_7: *rhel_7
+  fedora:
+    - python2-lxml
+  fedora_27:
+    - libselinux-python3
+  fedora_28:
+    - python3-libselinux
+  rhel_8:
+    - python3-libselinux
+
+makefile_pkgs_req1: []
+makefile_pkgs_req2: []
+
+# This care about this lists will take str-common-init
+role_pkgs_req:
+  - beakerlib
+  - rsync
+  - make
+  - beakerlib-libraries
+  - "{{ beakerlib_pkgs_req[distro_name_ver] | default([]) }}"
+  - "{{ beakerlib_pkgs_req[distro_name] | default([]) }}"
+
+beakerlib_libraries_path: /usr/share/beakerlib-libraries
diff --git a/roles/standard-test-source/defaults/main.yml b/roles/standard-test-source/defaults/main.yml
deleted file mode 100644
index 17987ab..0000000
--- a/roles/standard-test-source/defaults/main.yml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-artifacts: "{{ lookup('env', 'TEST_ARTIFACTS') | default('./artifacts', true) }}"
-pkgdir: "{{ playbook_dir }}/.."
-# tenv_workdir is imported from str-common-pkgs role
-srcdir: "{{ tenv_workdir }}/source"
-flatten: True
-fetch_only: False
-# list of packages that will be installed on test-env by str-common-pkgs
-role_pkgs_req:
-  - rpm-build
-missing_pkgs: []
diff --git a/roles/standard-test-source/vars/main.yml b/roles/standard-test-source/vars/main.yml
new file mode 100644
index 0000000..17987ab
--- /dev/null
+++ b/roles/standard-test-source/vars/main.yml
@@ -0,0 +1,11 @@
+---
+artifacts: "{{ lookup('env', 'TEST_ARTIFACTS') | default('./artifacts', true) }}"
+pkgdir: "{{ playbook_dir }}/.."
+# tenv_workdir is imported from str-common-pkgs role
+srcdir: "{{ tenv_workdir }}/source"
+flatten: True
+fetch_only: False
+# list of packages that will be installed on test-env by str-common-pkgs
+role_pkgs_req:
+  - rpm-build
+missing_pkgs: []