summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-03-31 14:08:07 -0500
committerGitHub <noreply@github.com>2017-03-31 14:08:07 -0500
commit07fc2a220bb0e0c50118f405b98cae22e2d1ac37 (patch)
tree9a5a9cb6e23f35a59adf2c2645c4b6fc82133a24
parent06e3a677951fe164cccf9754522a825bbdf0139f (diff)
parent84f7dd305497c57adb9a46d453d1a94524eb1b5d (diff)
downloadopenshift-07fc2a220bb0e0c50118f405b98cae22e2d1ac37.tar.gz
openshift-07fc2a220bb0e0c50118f405b98cae22e2d1ac37.tar.bz2
openshift-07fc2a220bb0e0c50118f405b98cae22e2d1ac37.tar.xz
openshift-07fc2a220bb0e0c50118f405b98cae22e2d1ac37.zip
Merge pull request #3554 from php-coder/install_python3_pkg
Merged by openshift-bot
-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 93972f0e0..f657d86cf 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