summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-03 17:34:10 -0500
committerGitHub <noreply@github.com>2017-02-03 17:34:10 -0500
commitec0983dc4bc96573e3f7f958aea7040c15c1db81 (patch)
treef9875d3a99fa542a9facd78051bb3d4164c4e9bb
parentc8ddd41e0f1819cd9a23a0b5679b8d0360aec92a (diff)
parentce72b251661d0ea83107036ce6d18b40a331b99c (diff)
downloadopenshift-ec0983dc4bc96573e3f7f958aea7040c15c1db81.tar.gz
openshift-ec0983dc4bc96573e3f7f958aea7040c15c1db81.tar.bz2
openshift-ec0983dc4bc96573e3f7f958aea7040c15c1db81.tar.xz
openshift-ec0983dc4bc96573e3f7f958aea7040c15c1db81.zip
Merge pull request #3259 from sdodson/ruamel-yaml-dep
Ensure python-ruamel-yaml is installed
-rw-r--r--openshift-ansible.spec1
-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
4 files changed, 11 insertions, 4 deletions
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index 9faf3e78e..8cec36bb7 100644
--- a/openshift-ansible.spec
+++ b/openshift-ansible.spec
@@ -20,6 +20,7 @@ Requires: tar
Requires: openshift-ansible-docs = %{version}-%{release}
Requires: java-1.8.0-openjdk-headless
Requires: httpd-tools
+Requires: python-ruamel-yaml
%description
Openshift and Atomic Enterprise Ansible
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