From f01688ab89b711f0b927a709faee7547354998c9 Mon Sep 17 00:00:00 2001
From: Andrew Butcher <abutcher@redhat.com>
Date: Wed, 21 Sep 2016 11:02:21 -0400
Subject: Add GCE cloud provider kind.
---
roles/openshift_facts/library/openshift_facts.py | 6 ++++++
1 file changed, 6 insertions(+)
(limited to 'roles/openshift_facts/library')
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
--
cgit v1.2.3