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 <dgallowa@REDHAT.COM>

diff --git a/roles/common/tasks/rhel-entitlements.yml b/roles/common/tasks/rhel-entitlements.yml
index 255ac71a0d5f00fcbd7c901bd7f104a43c25ca6f..1ef3581fbb0125c383f20497bf53ae4fc0679946 100644 (file)
--- 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: