diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-06-29 20:50:23 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-06-29 20:50:23 -0400 |
| commit | 2396e8333d5a32636c1237186e5c853d2ab69d4a (patch) | |
| tree | 7ce6f9925226a726a1d24e3e4630f9066b943b1d | |
| parent | a9ac3505b07ac976c635129d114933b2b4169d94 (diff) | |
| parent | 5b21d78d166a3266064cf0ead4f6e4e9a2957c22 (diff) | |
| download | openshift-2396e8333d5a32636c1237186e5c853d2ab69d4a.tar.gz openshift-2396e8333d5a32636c1237186e5c853d2ab69d4a.tar.bz2 openshift-2396e8333d5a32636c1237186e5c853d2ab69d4a.tar.xz openshift-2396e8333d5a32636c1237186e5c853d2ab69d4a.zip | |
Merge pull request #4572 from sdodson/rhel_subscribe_remove_openshift_facts
Get rid of openshift_facts dep in rhel_subscribe
| -rw-r--r-- | roles/rhel_subscribe/meta/main.yml | 3 | ||||
| -rw-r--r-- | roles/rhel_subscribe/tasks/main.yml | 10 |
2 files changed, 9 insertions, 4 deletions
diff --git a/roles/rhel_subscribe/meta/main.yml b/roles/rhel_subscribe/meta/main.yml index 0bbeadd34..23d65c7ef 100644 --- a/roles/rhel_subscribe/meta/main.yml +++ b/roles/rhel_subscribe/meta/main.yml @@ -1,3 +1,2 @@ --- -dependencies: - - role: openshift_facts +dependencies: [] diff --git a/roles/rhel_subscribe/tasks/main.yml b/roles/rhel_subscribe/tasks/main.yml index 28c3c7080..453044a6e 100644 --- a/roles/rhel_subscribe/tasks/main.yml +++ b/roles/rhel_subscribe/tasks/main.yml @@ -21,6 +21,11 @@ msg: Either rhsub_pass or the rhel_subscription_pass env variable are required for this role. when: rhel_subscription_pass is not defined +- name: Detecting Atomic Host Operating System + stat: + path: /run/ostree-booted + register: ostree_booted + - name: Satellite preparation command: "rpm -Uvh http://{{ rhel_subscription_server }}/pub/katello-ca-consumer-latest.noarch.rpm" args: @@ -57,5 +62,6 @@ when: openshift_pool_id.stdout != '' - include: enterprise.yml - when: deployment_type in [ 'enterprise', 'atomic-enterprise', 'openshift-enterprise' ] and - not openshift.common.is_atomic | bool + when: + - deployment_type in [ 'enterprise', 'atomic-enterprise', 'openshift-enterprise' ] + - not ostree_booted.stat.exists | bool |