summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster/upgrades
diff options
context:
space:
mode:
authorOpenShift Bot <eparis+openshiftbot@redhat.com>2017-05-26 19:10:39 -0500
committerGitHub <noreply@github.com>2017-05-26 19:10:39 -0500
commitc5f4a60fdd9ebc81180a96677717ca96b9badc72 (patch)
tree65ad8f8384f37ea8f57faa165ddf5391680f7633 /playbooks/common/openshift-cluster/upgrades
parent670ee735410691c5e2f2709aa17bb2e8e5be3e84 (diff)
parent0ee812822a5fe5ba7cc00d00c58744104c2d9fee (diff)
downloadopenshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.tar.gz
openshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.tar.bz2
openshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.tar.xz
openshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.zip
Merge pull request #4234 from vshn/feature/oreg_url_masternode
Merged by openshift-bot
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
index 0ad934d2d..e10c4c540 100644
--- a/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
+++ b/playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml
@@ -107,8 +107,8 @@
yedit:
src: "{{ openshift.common.config_base }}/master/master-config.yaml"
key: 'imageConfig.format'
- value: "{{ oreg_url }}"
- when: oreg_url is defined
+ value: "{{ oreg_url | default(oreg_url_master) }}"
+ when: oreg_url is defined or oreg_url_master is defined
# Run the upgrade hook prior to restarting services/system if defined:
- debug: msg="Running master upgrade hook {{ openshift_master_upgrade_hook }}"