Merge pull request #7622 from dak1n1/node_upgrade_order

Automatic merge from submit-queue.

Configure dnsmasq before waiting for node

In some cases, if dnsmasq isn't configured on a node during upgrade, the
upgrade can fail. Changed order of tasks to prevent failure.

roles/openshift_node/tasks/upgrade.yml

@@ -33,6 +33,9 @@
 
 - include_tasks: upgrade/config_changes.yml
 
+- include_tasks: dnsmasq_install.yml
+- include_tasks: dnsmasq.yml
+
 # Restart all services
 - include_tasks: upgrade/restart.yml
 
@@ -48,9 +51,6 @@
   retries: 24
   delay: 5
 
-- include_tasks: dnsmasq_install.yml
-- include_tasks: dnsmasq.yml
-
 - include_tasks: journald.yml
 
 - meta: flush_handlers