summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlava Semushin <vsemushi@redhat.com>2017-03-03 14:20:36 +0100
committerSlava Semushin <vsemushi@redhat.com>2017-03-24 15:28:42 +0100
commit84f7dd305497c57adb9a46d453d1a94524eb1b5d (patch)
tree2f3093928f50c85fbfbe9bb2c197906b5a2963a5
parent2d1f47412ecadf337045b51e7d0288ba9bca9a96 (diff)
downloadopenshift-84f7dd305497c57adb9a46d453d1a94524eb1b5d.tar.gz
openshift-84f7dd305497c57adb9a46d453d1a94524eb1b5d.tar.bz2
openshift-84f7dd305497c57adb9a46d453d1a94524eb1b5d.tar.xz
openshift-84f7dd305497c57adb9a46d453d1a94524eb1b5d.zip
openshift_facts: install python3-dbus package on Fedora nodes.
-rw-r--r--roles/openshift_facts/tasks/main.yml6
-rw-r--r--roles/openshift_facts/vars/Fedora.yml6
-rw-r--r--roles/openshift_facts/vars/default.yml6
-rw-r--r--roles/openshift_facts/vars/main.yml6
4 files changed, 18 insertions, 6 deletions
diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml
index 73c668c72..0bc413b71 100644
--- a/roles/openshift_facts/tasks/main.yml
+++ b/roles/openshift_facts/tasks/main.yml
@@ -47,6 +47,12 @@
when: l_is_atomic | bool
+- name: Load variables
+ include_vars: "{{ item }}"
+ with_first_found:
+ - "{{ ansible_distribution }}.yml"
+ - "default.yml"
+
- name: Ensure various deps are installed
package: name={{ item }} state=present
with_items: "{{ required_packages }}"
diff --git a/roles/openshift_facts/vars/Fedora.yml b/roles/openshift_facts/vars/Fedora.yml
new file mode 100644
index 000000000..745f5f398
--- /dev/null
+++ b/roles/openshift_facts/vars/Fedora.yml
@@ -0,0 +1,6 @@
+---
+required_packages:
+ - iproute
+ - python3-dbus
+ - PyYAML
+ - yum-utils
diff --git a/roles/openshift_facts/vars/default.yml b/roles/openshift_facts/vars/default.yml
new file mode 100644
index 000000000..3cd616d16
--- /dev/null
+++ b/roles/openshift_facts/vars/default.yml
@@ -0,0 +1,6 @@
+---
+required_packages:
+ - iproute
+ - python-dbus
+ - PyYAML
+ - yum-utils
diff --git a/roles/openshift_facts/vars/main.yml b/roles/openshift_facts/vars/main.yml
index 053a4cfc8..89d4034d3 100644
--- a/roles/openshift_facts/vars/main.yml
+++ b/roles/openshift_facts/vars/main.yml
@@ -1,10 +1,4 @@
---
-required_packages:
- - iproute
- - python-dbus
- - PyYAML
- - yum-utils
-
required_system_containers_packages:
- atomic
- ostree