summaryrefslogtreecommitdiffstats
path: root/roles
diff options
context:
space:
mode:
authorLénaïc Huard <lhuard@amadeus.com>2016-01-11 11:37:00 +0100
committerLénaïc Huard <lhuard@amadeus.com>2016-01-12 10:48:11 +0100
commit3e450c25f2e03ee06d8ef7d6825cd36294c77007 (patch)
tree666eb1dce6b5ea5f9952bbd3bdd04742cbd39a12 /roles
parent52a4f52d023c1fd670b761974e7a5f0ef35a0eaf (diff)
downloadopenshift-3e450c25f2e03ee06d8ef7d6825cd36294c77007.tar.gz
openshift-3e450c25f2e03ee06d8ef7d6825cd36294c77007.tar.bz2
openshift-3e450c25f2e03ee06d8ef7d6825cd36294c77007.tar.xz
openshift-3e450c25f2e03ee06d8ef7d6825cd36294c77007.zip
Move the `is_atomic` check from `update_repos_and_packages.yml` to `rhel_subscribe`
Diffstat (limited to 'roles')
-rw-r--r--roles/rhel_subscribe/meta/main.yml2
-rw-r--r--roles/rhel_subscribe/tasks/main.yml3
2 files changed, 4 insertions, 1 deletions
diff --git a/roles/rhel_subscribe/meta/main.yml b/roles/rhel_subscribe/meta/main.yml
new file mode 100644
index 000000000..bbc3ad172
--- /dev/null
+++ b/roles/rhel_subscribe/meta/main.yml
@@ -0,0 +1,2 @@
+dependencies:
+ - openshift_facts
diff --git a/roles/rhel_subscribe/tasks/main.yml b/roles/rhel_subscribe/tasks/main.yml
index eecfd04a0..85e17ff9d 100644
--- a/roles/rhel_subscribe/tasks/main.yml
+++ b/roles/rhel_subscribe/tasks/main.yml
@@ -41,4 +41,5 @@
command: subscription-manager subscribe --pool {{ openshift_pool_id.stdout_lines[0] }}
- include: enterprise.yml
- when: deployment_type in [ 'enterprise', 'atomic-enterprise', 'openshift-enterprise' ]
+ when: deployment_type in [ 'enterprise', 'atomic-enterprise', 'openshift-enterprise' ] and
+ not openshift.common.is_atomic | bool