summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim Bielawa <tbielawa@redhat.com>2017-01-04 10:54:01 -0800
committerTim Bielawa <tbielawa@redhat.com>2017-01-04 13:33:56 -0800
commit6da67c7364c94768cdc713e948ce4322a521ac12 (patch)
tree975c302a3531010375f202fc14d69ee11d5c1d9c
parentc595be4c25837da51ca38dcc60b4eb5e36beeff9 (diff)
downloadopenshift-6da67c7364c94768cdc713e948ce4322a521ac12.tar.gz
openshift-6da67c7364c94768cdc713e948ce4322a521ac12.tar.bz2
openshift-6da67c7364c94768cdc713e948ce4322a521ac12.tar.xz
openshift-6da67c7364c94768cdc713e948ce4322a521ac12.zip
Add required python-six package to installation
* Moves package list into a defaults/main.yml file * Closes #3020
-rw-r--r--roles/openshift_facts/tasks/main.yml6
-rw-r--r--roles/openshift_facts/vars/main.yml7
2 files changed, 9 insertions, 4 deletions
diff --git a/roles/openshift_facts/tasks/main.yml b/roles/openshift_facts/tasks/main.yml
index 70cf49dd4..b7b521f1a 100644
--- a/roles/openshift_facts/tasks/main.yml
+++ b/roles/openshift_facts/tasks/main.yml
@@ -10,11 +10,9 @@
- set_fact:
l_is_containerized: "{{ (l_is_atomic | bool) or (containerized | default(false) | bool) }}"
-- name: Ensure PyYaml and yum-utils are installed
+- name: Ensure various deps are installed
package: name={{ item }} state=present
- with_items:
- - PyYAML
- - yum-utils
+ with_items: "{{ required_packages }}"
when: not l_is_atomic | bool
- name: Gather Cluster facts and set is_containerized if needed
diff --git a/roles/openshift_facts/vars/main.yml b/roles/openshift_facts/vars/main.yml
new file mode 100644
index 000000000..9c3110ff6
--- /dev/null
+++ b/roles/openshift_facts/vars/main.yml
@@ -0,0 +1,7 @@
+---
+required_packages:
+ - iproute
+ - python-dbus
+ - python-six
+ - PyYAML
+ - yum-utils