diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-09-22 09:44:36 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-22 09:44:36 -0400 |
| commit | deaf1b68ed2764408d54a9a44a71abb7dfc133c2 (patch) | |
| tree | 7457f097cf3123df2fbc55f129025f7b45845d29 | |
| parent | 5116804e0717c4070ccc80aba9a0dc50a87aa35b (diff) | |
| parent | f01688ab89b711f0b927a709faee7547354998c9 (diff) | |
| download | openshift-deaf1b68ed2764408d54a9a44a71abb7dfc133c2.tar.gz openshift-deaf1b68ed2764408d54a9a44a71abb7dfc133c2.tar.bz2 openshift-deaf1b68ed2764408d54a9a44a71abb7dfc133c2.tar.xz openshift-deaf1b68ed2764408d54a9a44a71abb7dfc133c2.zip | |
Merge pull request #2484 from abutcher/gce-cloud-provider
Add GCE cloud provider kind.
| -rw-r--r-- | inventory/byo/hosts.origin.example | 3 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 3 | ||||
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 6 |
3 files changed, 12 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index bfef467f9..8b3a6e403 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -149,6 +149,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', #openshift_cloudprovider_openstack_tenant_name=tenant_name #openshift_cloudprovider_openstack_region=region #openshift_cloudprovider_openstack_lb_subnet_id=subnet_id +# +# GCE +#openshift_cloudprovider_kind=gce # Project Configuration #osm_project_request_message='' diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 6e04f7d8e..af653f850 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -148,6 +148,9 @@ openshift_master_identity_providers=[{'name': 'htpasswd_auth', 'login': 'true', #openshift_cloudprovider_openstack_tenant_name=tenant_name #openshift_cloudprovider_openstack_region=region #openshift_cloudprovider_openstack_lb_subnet_id=subnet_id +# +# GCE +#openshift_cloudprovider_kind=gce # Project Configuration #osm_project_request_message='' 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 |