summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-02-27 08:20:09 -0500
committerScott Dodson <sdodson@redhat.com>2017-03-03 15:29:00 -0500
commit7dbca133a2600b0c49482ca10aaf3f0d8e46f1a0 (patch)
tree32f9eff43fc023668f393b890c8faebc61332c41
parent00b03095554a175cba0a4a47da6ee4cc5f39f7de (diff)
downloadopenshift-7dbca133a2600b0c49482ca10aaf3f0d8e46f1a0.tar.gz
openshift-7dbca133a2600b0c49482ca10aaf3f0d8e46f1a0.tar.bz2
openshift-7dbca133a2600b0c49482ca10aaf3f0d8e46f1a0.tar.xz
openshift-7dbca133a2600b0c49482ca10aaf3f0d8e46f1a0.zip
BZ1422348 - Don't install python-ruamel-yaml
Just rely on PyYAML as a fallback and hope that's there
-rw-r--r--openshift-ansible.spec1
-rw-r--r--roles/lib_openshift/meta/main.yml3
-rw-r--r--roles/lib_openshift/tasks/main.yml10
-rw-r--r--roles/lib_utils/meta/main.yml3
-rw-r--r--roles/lib_utils/tasks/main.yml10
5 files changed, 2 insertions, 25 deletions
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index eefe50348..c7b4544be 100644
--- a/openshift-ansible.spec
+++ b/openshift-ansible.spec
@@ -24,7 +24,6 @@ Requires: tar
Requires: openshift-ansible-docs = %{version}-%{release}
Requires: java-1.8.0-openjdk-headless
Requires: httpd-tools
-Requires: python-ruamel-yaml
Requires: libselinux-python
%description
diff --git a/roles/lib_openshift/meta/main.yml b/roles/lib_openshift/meta/main.yml
index 7c72daa63..d5e7ec6e5 100644
--- a/roles/lib_openshift/meta/main.yml
+++ b/roles/lib_openshift/meta/main.yml
@@ -11,5 +11,4 @@ galaxy_info:
- 7
categories:
- cloud
-dependencies:
-- { role: openshift_repos }
+dependencies: []
diff --git a/roles/lib_openshift/tasks/main.yml b/roles/lib_openshift/tasks/main.yml
index b8af7c7c9..ed97d539c 100644
--- a/roles/lib_openshift/tasks/main.yml
+++ b/roles/lib_openshift/tasks/main.yml
@@ -1,11 +1 @@
---
-- name: lib_openshift detect ostree
- stat:
- path: /run/ostree-booted
- register: ostree_booted
-
-- name: lib_openshift ensure python-ruamel-yaml package is on target
- package:
- name: python2-ruamel-yaml
- state: present
- when: not ostree_booted.stat.exists
diff --git a/roles/lib_utils/meta/main.yml b/roles/lib_utils/meta/main.yml
index e06b9a0f1..cc18c453c 100644
--- a/roles/lib_utils/meta/main.yml
+++ b/roles/lib_utils/meta/main.yml
@@ -11,5 +11,4 @@ galaxy_info:
- 7
categories:
- cloud
-dependencies:
-- { role: openshift_repos }
+dependencies: []
diff --git a/roles/lib_utils/tasks/main.yml b/roles/lib_utils/tasks/main.yml
index 32ab9e0c6..ed97d539c 100644
--- a/roles/lib_utils/tasks/main.yml
+++ b/roles/lib_utils/tasks/main.yml
@@ -1,11 +1 @@
---
-- name: lib_utils detect ostree
- stat:
- path: /run/ostree-booted
- register: ostree_booted
-
-- name: lib_utils ensure python-ruamel-yaml package is on target
- package:
- name: python-ruamel-yaml
- state: present
- when: not ostree_booted.stat.exists