summaryrefslogtreecommitdiffstats
path: root/roles/openshift_node_upgrade
diff options
context:
space:
mode:
authorTobias Brunner <tobias@tobru.ch>2017-05-19 13:27:50 +0200
committerScott Dodson <sdodson@redhat.com>2017-05-19 09:42:45 -0400
commit0ee812822a5fe5ba7cc00d00c58744104c2d9fee (patch)
tree506bde2bc0480c8a3ff9cdc15371612806fd2642 /roles/openshift_node_upgrade
parentb61044dfa3669d79bd5e99c846ad4d10de172583 (diff)
downloadopenshift-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 'roles/openshift_node_upgrade')
-rw-r--r--roles/openshift_node_upgrade/tasks/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_node_upgrade/tasks/main.yml b/roles/openshift_node_upgrade/tasks/main.yml
index 7231bdb9d..d44839d69 100644
--- a/roles/openshift_node_upgrade/tasks/main.yml
+++ b/roles/openshift_node_upgrade/tasks/main.yml
@@ -92,8 +92,8 @@
yedit:
src: "{{ openshift.common.config_base }}/node/node-config.yaml"
key: 'imageConfig.format'
- value: "{{ oreg_url }}"
- when: oreg_url is defined
+ value: "{{ oreg_url | default(oreg_url_node) }}"
+ when: oreg_url is defined or oreg_url_node is defined
# https://docs.openshift.com/container-platform/3.4/admin_guide/overcommit.html#disabling-swap-memory
- name: Check for swap usage