diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-11-07 07:46:45 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-07 07:46:45 -0500 |
| commit | b97196e3319c5ec00fdd9998aba51b4877d3ada9 (patch) | |
| tree | 1c45a67bca0441da9f5bc1b34bc57d68014948f7 /roles/openshift_facts | |
| parent | 4698b0c696b9d9cf2b8dbff5eaa4fcaa545093cd (diff) | |
| parent | 2659a4f891d22dd820bd30f8d3b1dbd8793abb7a (diff) | |
| download | openshift-b97196e3319c5ec00fdd9998aba51b4877d3ada9.tar.gz openshift-b97196e3319c5ec00fdd9998aba51b4877d3ada9.tar.bz2 openshift-b97196e3319c5ec00fdd9998aba51b4877d3ada9.tar.xz openshift-b97196e3319c5ec00fdd9998aba51b4877d3ada9.zip | |
Merge pull request #2728 from sjenning/fix-gce-multizone
default to multizone GCE config
Diffstat (limited to 'roles/openshift_facts')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 6c045e7ab..95325610d 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1060,6 +1060,7 @@ values provided as a list. Hence the gratuitous use of ['foo'] below. kubelet_args['cloud-config'] = [cloud_cfg_path + '/openstack.conf'] if facts['cloudprovider']['kind'] == 'gce': kubelet_args['cloud-provider'] = ['gce'] + kubelet_args['cloud-config'] = [cloud_cfg_path + '/gce.conf'] # Automatically add node-labels to the kubeletArguments # parameter. See BZ1359848 for additional details. @@ -1102,6 +1103,7 @@ def build_controller_args(facts): controller_args['cloud-config'] = [cloud_cfg_path + '/openstack.conf'] if facts['cloudprovider']['kind'] == 'gce': controller_args['cloud-provider'] = ['gce'] + kubelet_args['cloud-config'] = [cloud_cfg_path + '/gce.conf'] if controller_args != {}: facts = merge_facts({'master': {'controller_args': controller_args}}, facts, [], []) return facts @@ -1122,6 +1124,7 @@ def build_api_server_args(facts): api_server_args['cloud-config'] = [cloud_cfg_path + '/openstack.conf'] if facts['cloudprovider']['kind'] == 'gce': api_server_args['cloud-provider'] = ['gce'] + kubelet_args['cloud-config'] = [cloud_cfg_path + '/gce.conf'] if api_server_args != {}: facts = merge_facts({'master': {'api_server_args': api_server_args}}, facts, [], []) return facts |