diff options
| author | Andrew Butcher <abutcher@redhat.com> | 2016-09-21 11:02:21 -0400 |
|---|---|---|
| committer | Andrew Butcher <abutcher@redhat.com> | 2016-09-21 11:02:21 -0400 |
| commit | f01688ab89b711f0b927a709faee7547354998c9 (patch) | |
| tree | a8c7d51bca5782261ebd44000b82cd97ff8b817b /roles | |
| parent | 4313ad4b3d5dad85d1016d64cc558a749919c563 (diff) | |
| download | openshift-f01688ab89b711f0b927a709faee7547354998c9.tar.gz openshift-f01688ab89b711f0b927a709faee7547354998c9.tar.bz2 openshift-f01688ab89b711f0b927a709faee7547354998c9.tar.xz openshift-f01688ab89b711f0b927a709faee7547354998c9.zip | |
Add GCE cloud provider kind.
Diffstat (limited to 'roles')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 7182ac627..b2d007ec9 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1036,6 +1036,8 @@ def build_kubelet_args(facts): if facts['cloudprovider']['kind'] == 'openstack': kubelet_args['cloud-provider'] = ['openstack'] kubelet_args['cloud-config'] = [cloud_cfg_path + '/openstack.conf'] + if facts['cloudprovider']['kind'] == 'gce': + kubelet_args['cloud-provider'] = ['gce'] if kubelet_args != {}: facts = merge_facts({'node': {'kubelet_args': kubelet_args}}, facts, [], []) return facts @@ -1054,6 +1056,8 @@ def build_controller_args(facts): if facts['cloudprovider']['kind'] == 'openstack': controller_args['cloud-provider'] = ['openstack'] controller_args['cloud-config'] = [cloud_cfg_path + '/openstack.conf'] + if facts['cloudprovider']['kind'] == 'gce': + controller_args['cloud-provider'] = ['gce'] if controller_args != {}: facts = merge_facts({'master': {'controller_args': controller_args}}, facts, [], []) return facts @@ -1072,6 +1076,8 @@ def build_api_server_args(facts): if facts['cloudprovider']['kind'] == 'openstack': api_server_args['cloud-provider'] = ['openstack'] api_server_args['cloud-config'] = [cloud_cfg_path + '/openstack.conf'] + if facts['cloudprovider']['kind'] == 'gce': + api_server_args['cloud-provider'] = ['gce'] if api_server_args != {}: facts = merge_facts({'master': {'api_server_args': api_server_args}}, facts, [], []) return facts |