Merge pull request #9245 from mgugino-upstream-stage/oreg-upgrade

Always ensure master config has proper url upgrade

roles/openshift_control_plane/tasks/upgrade.yml

@@ -61,8 +61,7 @@
   yedit:
     src: "{{ openshift.common.config_base }}/master/master-config.yaml"
     key: 'imageConfig.format'
-    value: "{{ oreg_url }}"
-  when: oreg_url is defined
+    value: "{{ openshift_imageconfig_format }}"
 
 - name: Change default node selector to compute=true
   yedit: