diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-05-26 19:10:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-05-26 19:10:39 -0500 |
| commit | c5f4a60fdd9ebc81180a96677717ca96b9badc72 (patch) | |
| tree | 65ad8f8384f37ea8f57faa165ddf5391680f7633 /roles/openshift_master_facts | |
| parent | 670ee735410691c5e2f2709aa17bb2e8e5be3e84 (diff) | |
| parent | 0ee812822a5fe5ba7cc00d00c58744104c2d9fee (diff) | |
| download | openshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.tar.gz openshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.tar.bz2 openshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.tar.xz openshift-c5f4a60fdd9ebc81180a96677717ca96b9badc72.zip | |
Merge pull request #4234 from vshn/feature/oreg_url_masternode
Merged by openshift-bot
Diffstat (limited to 'roles/openshift_master_facts')
| -rw-r--r-- | roles/openshift_master_facts/tasks/main.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_master_facts/tasks/main.yml b/roles/openshift_master_facts/tasks/main.yml index 79f054b42..ef8dcd5fd 100644 --- a/roles/openshift_master_facts/tasks/main.yml +++ b/roles/openshift_master_facts/tasks/main.yml @@ -74,7 +74,7 @@ ldap_ca: "{{ openshift_master_ldap_ca | default(lookup('file', openshift_master_ldap_ca_file) if openshift_master_ldap_ca_file is defined else None) }}" openid_ca: "{{ openshift_master_openid_ca | default(lookup('file', openshift_master_openid_ca_file) if openshift_master_openid_ca_file is defined else None) }}" request_header_ca: "{{ openshift_master_request_header_ca | default(lookup('file', openshift_master_request_header_ca_file) if openshift_master_request_header_ca_file is defined else None) }}" - registry_url: "{{ oreg_url | default(None) }}" + registry_url: "{{ oreg_url_master | default(oreg_url) | default(None) }}" oauth_grant_method: "{{ openshift_master_oauth_grant_method | default(None) }}" sdn_cluster_network_cidr: "{{ osm_cluster_network_cidr | default(None) }}" sdn_host_subnet_length: "{{ osm_host_subnet_length | default(None) }}" |