summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/defaults
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-21 10:21:34 -0700
committerGitHub <noreply@github.com>2017-09-21 10:21:34 -0700
commit505764651b3f8279ffe8881e9b26851d1dd14258 (patch)
tree910d1f193dfdb9646bdec6c4331efebb4646a5fb /roles/openshift_master/defaults
parentf18cf4fd09448f2546d1c903f68acadb0c1367d9 (diff)
parent0fee9f4e194101cfbd094d140b59d1b262b9b6a6 (diff)
downloadopenshift-505764651b3f8279ffe8881e9b26851d1dd14258.tar.gz
openshift-505764651b3f8279ffe8881e9b26851d1dd14258.tar.bz2
openshift-505764651b3f8279ffe8881e9b26851d1dd14258.tar.xz
openshift-505764651b3f8279ffe8881e9b26851d1dd14258.zip
Merge pull request #5477 from mgugino-upstream-stage/hot-fix-oreg_url
Automatic merge from submit-queue Remove default value for oreg_url Due to some plays importing variables from roles directly, oreg_url was being set to a default value when it otherwise shouldn't be. This commit removes the default values for oreg_url to ensure existing logic works as desired. Fixes: https://github.com/openshift/openshift-ansible/issues/5455
Diffstat (limited to 'roles/openshift_master/defaults')
-rw-r--r--roles/openshift_master/defaults/main.yml4
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml
index 4c8d6fdad..73e935d3f 100644
--- a/roles/openshift_master/defaults/main.yml
+++ b/roles/openshift_master/defaults/main.yml
@@ -20,8 +20,8 @@ r_openshift_master_os_firewall_allow:
port: 4001/tcp
cond: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}"
-oreg_url: ''
-oreg_host: "{{ oreg_url.split('/')[0] if '.' in oreg_url.split('/')[0] else '' }}"
+# oreg_url is defined by user input
+oreg_host: "{{ oreg_url.split('/')[0] if (oreg_url is defined and '.' in oreg_url.split('/')[0]) else '' }}"
oreg_auth_credentials_path: "{{ r_openshift_master_data_dir }}/.docker"
oreg_auth_credentials_replace: False
l_bind_docker_reg_auth: False