Remove last of openshift_node role meta-depends

Remove last non-taskless meta-depends from
openshift_node role.

Remove variable 'openshift_node_upgrade_in_progress' as
it is no longer used.

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

@@ -304,8 +304,6 @@
   - include_role:
       name: openshift_node
       tasks_from: upgrade.yml
-    vars:
-      openshift_node_upgrade_in_progress: True
   - name: Set node schedulability
     oc_adm_manage_node:
       node: "{{ openshift.node.nodename | lower }}"

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

@@ -7,8 +7,6 @@
   - include_role:
       name: openshift_node
       tasks_from: upgrade_pre.yml
-    vars:
-      openshift_node_upgrade_in_progress: True
 
 - name: Drain and upgrade nodes
   hosts: oo_nodes_to_upgrade:!oo_masters_to_config
@@ -46,8 +44,6 @@
   - include_role:
       name: openshift_node
       tasks_from: upgrade.yml
-    vars:
-      openshift_node_upgrade_in_progress: True
   - name: Set node schedulability
     oc_adm_manage_node:
       node: "{{ openshift.node.nodename | lower }}"

playbooks/openshift-node/private/configure_nodes.yml

@@ -11,6 +11,7 @@
                                                 }}"
   roles:
   - role: openshift_clock
+  - role: openshift_cloud_provider
   - role: openshift_node
   - role: tuned
   - role: nickhammond.logrotate

playbooks/openshift-node/private/containerized_nodes.yml

@@ -13,6 +13,7 @@
 
   roles:
   - role: openshift_clock
+  - role: openshift_cloud_provider
   - role: openshift_node
     openshift_ca_host: "{{ groups.oo_first_master.0 }}"
   - role: nickhammond.logrotate

roles/openshift_node/meta/main.yml

@@ -13,6 +13,4 @@ galaxy_info:
   - cloud
 dependencies:
 - role: lib_openshift
-- role: openshift_cloud_provider
-  when: not (openshift_node_upgrade_in_progress | default(False))
 - role: lib_utils