Merge pull request #4044 from mtnbikenc/clean-cache

Merged by openshift-bot

playbooks/common/openshift-cluster/upgrades/init.yml

@@ -10,17 +10,6 @@
 
 - include: ../initialize_facts.yml
 
-- name: Ensure clean repo cache in the event repos have been changed manually
-  hosts: oo_all_hosts
-  tags:
-  - pre_upgrade
-  tasks:
-  - name: Clean package cache
-    command: "{{ ansible_pkg_mgr }} clean all"
-    when: not openshift.common.is_atomic | bool
-    args:
-      warn: no
-
 - name: Ensure firewall is not switched during upgrade
   hosts: oo_all_hosts
   tasks:

roles/openshift_repos/tasks/main.yaml

@@ -40,4 +40,21 @@
     - openshift_deployment_type == 'origin'
     - openshift_enable_origin_repo | default(true) | bool
 
+  # Singleton block
+  - when: r_osr_first_run | default(true)
+    block:
+    - name: Ensure clean repo cache in the event repos have been changed manually
+      debug:
+        msg: "First run of openshift_repos"
+      changed_when: true
+      notify: refresh cache
+
+    - name: Set fact r_osr_first_run false
+      set_fact:
+        r_osr_first_run: false
+
+  # Force running ALL handlers now, because we expect repo cache to be cleared
+  # if changes have been made.
+  - meta: flush_handlers
+
   when: not ostree_booted.stat.exists