summaryrefslogtreecommitdiffstats
path: root/roles/openshift_master/defaults
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-08-29 10:13:15 -0400
committerGitHub <noreply@github.com>2017-08-29 10:13:15 -0400
commit5e32de3e8e9b302dbc9f4ba26985380197ac4171 (patch)
treeb4c74790895dab78bcd3f2f2865032010a15f338 /roles/openshift_master/defaults
parent4338dce09dbe5497f2a3700992eb4c5afeb4e6f6 (diff)
parent5815311c8fbad15fe23691e010ce7e4a132f6e7c (diff)
downloadopenshift-5e32de3e8e9b302dbc9f4ba26985380197ac4171.tar.gz
openshift-5e32de3e8e9b302dbc9f4ba26985380197ac4171.tar.bz2
openshift-5e32de3e8e9b302dbc9f4ba26985380197ac4171.tar.xz
openshift-5e32de3e8e9b302dbc9f4ba26985380197ac4171.zip
Merge pull request #5128 from mgugino-upstream-stage/reg-auth
Add independent registry auth support
Diffstat (limited to 'roles/openshift_master/defaults')
-rw-r--r--roles/openshift_master/defaults/main.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml
index cbc879d31..d70106276 100644
--- a/roles/openshift_master/defaults/main.yml
+++ b/roles/openshift_master/defaults/main.yml
@@ -19,3 +19,8 @@ r_openshift_master_os_firewall_allow:
- service: etcd embedded
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_auth_credentials_path: "{{ openshift.common.data_dir }}/.docker"
+oreg_auth_credentials_replace: False