Remove some pointless usages of openshift_facts

Removing things that don't look needed.

playbooks/common/openshift-cluster/upgrades/v3_9/upgrade_control_plane.yml

@@ -130,12 +130,12 @@
     service:
       name: "{{ openshift_service_type }}-master-controllers"
       state: restarted
-    when: openshift.common.rolling_restart_mode == 'services'
+    when: openshift_rolling_restart_mode | default('services') == 'services'
   - name: Re-enable master controllers to force new leader election mode
     service:
       name: "{{ openshift_service_type }}-master-controllers"
       enabled: true
-    when: openshift.common.rolling_restart_mode == 'system'
+    when: openshift_rolling_restart_mode | default('services') == 'system'
 
 
 - import_playbook: ../post_control_plane.yml

playbooks/openshift-master/private/upgrade.yml

@@ -94,13 +94,13 @@
     service:
       name: "{{ openshift_service_type }}-master-controllers"
       enabled: false
-    when: openshift.common.rolling_restart_mode == 'system'
+    when: openshift_rolling_restart_mode | default('services') == 'system'
 
   - include_tasks: tasks/restart_hosts.yml
-    when: openshift.common.rolling_restart_mode == 'system'
+    when: openshift_rolling_restart_mode | default('services') == 'system'
 
   - include_tasks: tasks/restart_services.yml
-    when: openshift.common.rolling_restart_mode == 'services'
+    when: openshift_rolling_restart_mode | default('services') == 'services'
 
   # Run the post-upgrade hook if defined:
   - debug: msg="Running master post-upgrade hook {{ openshift_master_upgrade_post_hook }}"

playbooks/openshift-master/private/validate_restart.yml

@@ -7,13 +7,6 @@
   - fail:
       msg: "openshift_rolling_restart_mode must be set to either 'services' or 'system'"
     when: openshift_rolling_restart_mode is defined and openshift_rolling_restart_mode not in ["services", "system"]
-  - openshift_facts:
-      role: "{{ item.role }}"
-      local_facts: "{{ item.local_facts }}"
-    with_items:
-    - role: common
-      local_facts:
-        rolling_restart_mode: "{{ openshift_rolling_restart_mode | default('services') }}"
 
 # Creating a temp file on localhost, we then check each system that will
 # be rebooted to see if that file exists, if so we know we're running
@@ -58,9 +51,9 @@
         inventory and relaunch the playbook.
     when:
     - "'stat' in exists"
-    - exists.stat.exists and openshift.common.rolling_restart_mode == 'system'
+    - exists.stat.exists and openshift_rolling_restart_mode | default('services') == 'system'
   - set_fact:
       current_host: "{{ exists.stat.exists }}"
     when:
     - "'stat' in exists"
-    - openshift.common.rolling_restart_mode == 'system'
+    - openshift_rolling_restart_mode | default('services') == 'system'

roles/etcd/tasks/upgrade/upgrade_image.yml

@@ -50,10 +50,3 @@
   until: etcdctl.rc == 0
   retries: 3
   delay: 10
-
-- name: Store new etcd_image
-  # DEPENDENCY openshift_facts
-  openshift_facts:
-    role: etcd
-    local_facts:
-      etcd_image: "{{ new_etcd_image }}"

roles/openshift_cli/tasks/main.yml

@@ -37,9 +37,6 @@
   - openshift_is_containerized | bool
   - l_use_cli_atomic_image | bool
 
-- name: Reload facts to pick up installed OpenShift version
-  openshift_facts:
-
 - name: Install bash completion for oc tools
   package: name=bash-completion state=present
   when: not openshift_is_containerized | bool