From 0ee812822a5fe5ba7cc00d00c58744104c2d9fee Mon Sep 17 00:00:00 2001 From: Tobias Brunner Date: Fri, 19 May 2017 13:27:50 +0200 Subject: allow to configure oreg_url specifically for node or master. refs #4233 This commit allows to specify imageConfig.format specifically for master or for nodes. One use case of this could be if you want to use customer builder images. In this case imageConfig.format only needs to be changed in the master-config.yml but not in the node-config.yml. --- playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'playbooks/common/openshift-cluster') 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 }}" -- cgit v1.2.3