2 files changed, 15 insertions, 13 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
index 399b818a7..fa65567c2 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
@@ -317,13 +317,13 @@
     delay: 60
 
   roles:
-  - lib_openshift
   - openshift_facts
-  - docker
-  - openshift_node_dnsmasq
-  - openshift_node_upgrade
-
   post_tasks:
+  - 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 }}"
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml
index c93a5d89c..5dc8193a7 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_nodes.yml
@@ -34,16 +34,18 @@
     delay: 60
 
   roles:
-  - lib_openshift
   - openshift_facts
-  - docker
-  - openshift_node_dnsmasq
-  - openshift_node_upgrade
-  - role: openshift_excluder
-    r_openshift_excluder_action: enable
-    r_openshift_excluder_service_type: "{{ openshift.common.service_type }}"
-
   post_tasks:
+  - include_role:
+      name: openshift_node
+      tasks_from: upgrade.yml
+    vars:
+      openshift_node_upgrade_in_progress: True
+  - include_role:
+      name: openshift_excluder
+    vars:
+      r_openshift_excluder_action: enable
+      r_openshift_excluder_service_type: "{{ openshift.common.service_type }}"
   - name: Set node schedulability
     oc_adm_manage_node:
       node: "{{ openshift.node.nodename | lower }}"