summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-03 08:56:24 -0500
committerScott Dodson <sdodson@redhat.com>2017-02-03 16:36:10 -0500
commitce72b251661d0ea83107036ce6d18b40a331b99c (patch)
tree032a18ddc39c1813839f77ea0bb3bee4804e5486 /roles
parent98d6f514256471134f80c51a737b47bf21810bd9 (diff)
downloadopenshift-ce72b251661d0ea83107036ce6d18b40a331b99c.tar.gz
openshift-ce72b251661d0ea83107036ce6d18b40a331b99c.tar.bz2
openshift-ce72b251661d0ea83107036ce6d18b40a331b99c.tar.xz
openshift-ce72b251661d0ea83107036ce6d18b40a331b99c.zip
Ensure python2-ruamel-yaml is installed
need to revisit this, currently python2-ruamel-yaml doesn't provide 'python-ruamel-yaml'. It probably should and that should be what we're installing.
Diffstat (limited to 'roles')
-rw-r--r--roles/lib_openshift/tasks/main.yml5
-rw-r--r--roles/lib_utils/tasks/main.yml5
-rw-r--r--roles/openshift_logging/tasks/main.yaml4
3 files changed, 10 insertions, 4 deletions
diff --git a/roles/lib_openshift/tasks/main.yml b/roles/lib_openshift/tasks/main.yml
new file mode 100644
index 000000000..2980c8a8d
--- /dev/null
+++ b/roles/lib_openshift/tasks/main.yml
@@ -0,0 +1,5 @@
+---
+- name: lib_openshift ensure python-ruamel-yaml package is on target
+ package:
+ name: python-ruamel-yaml
+ state: present
diff --git a/roles/lib_utils/tasks/main.yml b/roles/lib_utils/tasks/main.yml
new file mode 100644
index 000000000..8a350da88
--- /dev/null
+++ b/roles/lib_utils/tasks/main.yml
@@ -0,0 +1,5 @@
+---
+- name: lib_utils ensure python-ruamel-yaml package is on target
+ package:
+ name: python-ruamel-yaml
+ state: present
diff --git a/roles/openshift_logging/tasks/main.yaml b/roles/openshift_logging/tasks/main.yaml
index 36fb827c3..4c718805e 100644
--- a/roles/openshift_logging/tasks/main.yaml
+++ b/roles/openshift_logging/tasks/main.yaml
@@ -12,10 +12,6 @@
- debug: msg="Created temp dir {{mktemp.stdout}}"
-- name: Ensuring ruamel.yaml package is on target
- command: yum install -y ruamel.yaml
- check_mode: no
-
- name: Copy the admin client config(s)
command: >
cp {{ openshift_master_config_dir }}/admin.kubeconfig {{ mktemp.stdout }}/admin.kubeconfig