Merge pull request #7040 from sdodson/bz1542399

Automatic merge from submit-queue.

Make sure to include upgrade_pre when upgrading master nodes

Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1542399

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

@@ -311,6 +311,9 @@
   post_tasks:
   - import_role:
       name: openshift_node
+      tasks_from: upgrade_pre.yml
+  - import_role:
+      name: openshift_node
       tasks_from: upgrade.yml
   - import_role:
       name: openshift_manage_node