diff options
| author | Clayton Coleman <ccoleman@redhat.com> | 2017-11-05 01:25:30 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-05 01:25:30 -0400 |
| commit | bbea54dca12e8796764629b88c1faf596b2f5840 (patch) | |
| tree | a577663c65a6eba7ec60e00e2ae0e023359e143e /roles/openshift_master/defaults | |
| parent | 76f4f47c2fac8f2c1df8bf300069116f0dcfbf0e (diff) | |
| parent | 858afb085dab78018f90ff17871b83c1dd9ba5bd (diff) | |
| download | openshift-bbea54dca12e8796764629b88c1faf596b2f5840.tar.gz openshift-bbea54dca12e8796764629b88c1faf596b2f5840.tar.bz2 openshift-bbea54dca12e8796764629b88c1faf596b2f5840.tar.xz openshift-bbea54dca12e8796764629b88c1faf596b2f5840.zip | |
Merge pull request #6015 from openshift/revert-6006-elb-v2
Revert "Bootstrap enhancements."
Diffstat (limited to 'roles/openshift_master/defaults')
| -rw-r--r-- | roles/openshift_master/defaults/main.yml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/roles/openshift_master/defaults/main.yml b/roles/openshift_master/defaults/main.yml index 4acac7923..fe78dea66 100644 --- a/roles/openshift_master/defaults/main.yml +++ b/roles/openshift_master/defaults/main.yml @@ -26,6 +26,7 @@ default_r_openshift_master_os_firewall_allow: cond: "{{ groups.oo_etcd_to_config | default([]) | length == 0 }}" r_openshift_master_os_firewall_allow: "{{ default_r_openshift_master_os_firewall_allow | union(openshift_master_open_ports | default([])) }}" + # 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" @@ -59,7 +60,7 @@ r_openshift_master_sdn_network_plugin_name: "{{ r_openshift_master_sdn_network_p openshift_master_image_config_latest_default: "{{ openshift_image_config_latest | default(False) }}" openshift_master_image_config_latest: "{{ openshift_master_image_config_latest_default }}" -openshift_master_config_dir_default: "{{ openshift.common.config_base ~ '/master' if openshift is defined and 'common' in openshift else '/etc/origin/master' }}" +openshift_master_config_dir_default: "{{ (openshift.common.config_base | default('/etc/origin/master')) ~ '/master' }}" openshift_master_config_dir: "{{ openshift_master_config_dir_default }}" openshift_master_cloud_provider: "{{ openshift_cloudprovider_kind | default('aws') }}" @@ -70,6 +71,8 @@ openshift_master_node_config_kubeletargs_mem: 512M openshift_master_bootstrap_enabled: False +openshift_master_client_binary: "{{ openshift.common.client_binary if openshift is defined else 'oc' }}" + openshift_master_config_imageconfig_format: "{{ openshift.node.registry_url }}" # these are for the default settings in a generated node-config.yaml @@ -141,5 +144,3 @@ openshift_master_node_configs: - "{{ openshift_master_node_config_compute }}" openshift_master_bootstrap_namespace: openshift-node -openshift_master_csr_sa: node-bootstrapper -openshift_master_csr_namespace: openshift-infra |