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 /roles/openshift_master_facts | |
| 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 '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) }}" |