From: dgalloway Date: Wed, 12 Aug 2015 15:32:42 +0000 (-0400) Subject: Removed erroneous check X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=8fc7db6731f93b1c98af913c544fbe55e5626b3c;p=ceph-cm-ansible.git Removed erroneous check Fixes 1) already subscribed machines w/ bad repos weren't cleaned 2) enable repos would always run if 'rhsm_repos|length > 0' conditional used Signed-off-by: dgalloway --- diff --git a/roles/common/tasks/rhel-entitlements.yml b/roles/common/tasks/rhel-entitlements.yml index 255ac71..1ef3581 100644 --- a/roles/common/tasks/rhel-entitlements.yml +++ b/roles/common/tasks/rhel-entitlements.yml @@ -52,7 +52,7 @@ repo_list: "{{ repo_list_cmd.stdout.split('\n') }}" when: repo_list_cmd is defined and not repo_list_cmd|skipped -- name: Set replace_repos if rhsm_repos changed +- name: Set replace_repos if rhsm_repos differs from repo_list set_fact: replace_repos: "{{ repo_list|sort != rhsm_repos|sort }}" when: repo_list is defined @@ -62,21 +62,16 @@ replace_repos: True when: entitled|changed and entitled.rc == 0 -- name: Set replace_repos if entitlement is skipped - set_fact: - replace_repos: False - when: entitled|skipped - - name: Disable all rhsm repos command: subscription-manager repos --disable '*' - when: replace_repos == True + when: replace_repos # This produces an absurd amount of useless output no_log: True - name: Enable necessary rhsm repos command: subscription-manager repos --enable {{ item }} with_items: rhsm_repos - when: replace_repos == True and rhsm_repos|length > 0 + when: replace_repos - name: Remove old apt-mirror repository definition. file: