diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-11-09 17:29:44 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-11-09 17:29:44 -0500 |
| commit | dfd651717609da3ca506d8f5e805b1c40758a8de (patch) | |
| tree | 0600e0c5d235f0a7223bbcf92d63d42797da0fe9 /roles | |
| parent | 974f92f4ec1566fa45157dafca5cab76e69d6239 (diff) | |
| parent | 5a752437e6e852c514d0698c9241be759c03c6c7 (diff) | |
| download | openshift-dfd651717609da3ca506d8f5e805b1c40758a8de.tar.gz openshift-dfd651717609da3ca506d8f5e805b1c40758a8de.tar.bz2 openshift-dfd651717609da3ca506d8f5e805b1c40758a8de.tar.xz openshift-dfd651717609da3ca506d8f5e805b1c40758a8de.zip | |
Merge pull request #2776 from sdodson/BZ1390160
Fix typos in openshift_facts gce cloud provider
Diffstat (limited to 'roles')
| -rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 6d2b81c1f..9754687cf 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1122,7 +1122,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'] + controller_args['cloud-config'] = [cloud_cfg_path + '/gce.conf'] if controller_args != {}: facts = merge_facts({'master': {'controller_args': controller_args}}, facts, [], []) return facts @@ -1143,7 +1143,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'] + api_server_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 |