diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-16 20:59:21 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-16 20:59:21 -0500 |
| commit | 6490024590a75e739387dd0119d236a1362ff7ae (patch) | |
| tree | 34365f16c774c08ea04d6acccb3d872008da3f49 | |
| parent | 43659a5b19508336efa6901c7a38a6fa39a5a144 (diff) | |
| parent | 1a4a08e21ad29f5db4390f21362d23b01928fa02 (diff) | |
| download | openshift-6490024590a75e739387dd0119d236a1362ff7ae.tar.gz openshift-6490024590a75e739387dd0119d236a1362ff7ae.tar.bz2 openshift-6490024590a75e739387dd0119d236a1362ff7ae.tar.xz openshift-6490024590a75e739387dd0119d236a1362ff7ae.zip | |
Merge pull request #3395 from sdodson/ruamel-yaml-atomic
Don't attempt to install python-ruamel-yaml on atomic
| -rw-r--r-- | roles/lib_openshift/tasks/main.yml | 6 | ||||
| -rw-r--r-- | roles/lib_utils/tasks/main.yml | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/roles/lib_openshift/tasks/main.yml b/roles/lib_openshift/tasks/main.yml index 2980c8a8d..77366c65e 100644 --- a/roles/lib_openshift/tasks/main.yml +++ b/roles/lib_openshift/tasks/main.yml @@ -1,5 +1,11 @@ --- +- 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: python-ruamel-yaml state: present + when: not ostree_booted.stat.exists diff --git a/roles/lib_utils/tasks/main.yml b/roles/lib_utils/tasks/main.yml index 8a350da88..32ab9e0c6 100644 --- a/roles/lib_utils/tasks/main.yml +++ b/roles/lib_utils/tasks/main.yml @@ -1,5 +1,11 @@ --- +- 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 |