From 3e450c25f2e03ee06d8ef7d6825cd36294c77007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9na=C3=AFc=20Huard?= Date: Mon, 11 Jan 2016 11:37:00 +0100 Subject: Move the `is_atomic` check from `update_repos_and_packages.yml` to `rhel_subscribe` --- roles/rhel_subscribe/meta/main.yml | 2 ++ roles/rhel_subscribe/tasks/main.yml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) create mode 100644 roles/rhel_subscribe/meta/main.yml (limited to 'roles') 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 -- cgit v1.2.3