diff options
| author | Tobias Brunner <tobias@tobru.ch> | 2017-05-19 13:27:50 +0200 |
|---|---|---|
| committer | Scott Dodson <sdodson@redhat.com> | 2017-05-19 09:42:45 -0400 |
| commit | 0ee812822a5fe5ba7cc00d00c58744104c2d9fee (patch) | |
| tree | 506bde2bc0480c8a3ff9cdc15371612806fd2642 /playbooks/common/openshift-cluster | |
| parent | b61044dfa3669d79bd5e99c846ad4d10de172583 (diff) | |
| download | openshift-0ee812822a5fe5ba7cc00d00c58744104c2d9fee.tar.gz openshift-0ee812822a5fe5ba7cc00d00c58744104c2d9fee.tar.bz2 openshift-0ee812822a5fe5ba7cc00d00c58744104c2d9fee.tar.xz openshift-0ee812822a5fe5ba7cc00d00c58744104c2d9fee.zip | |
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.
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/upgrade_control_plane.yml | 4 |
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 }}" |