From ce72b251661d0ea83107036ce6d18b40a331b99c Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Fri, 3 Feb 2017 08:56:24 -0500 Subject: 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. --- openshift-ansible.spec | 1 + roles/lib_openshift/tasks/main.yml | 5 +++++ roles/lib_utils/tasks/main.yml | 5 +++++ roles/openshift_logging/tasks/main.yaml | 4 ---- 4 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 roles/lib_openshift/tasks/main.yml create mode 100644 roles/lib_utils/tasks/main.yml 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 -- cgit v1.2.3