diff options
author | Scott Dodson <sdodson@redhat.com> | 2017-01-30 17:32:31 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-01-30 17:32:31 -0500 |
commit | e6bec56b75baa631cdb4902d29cca811db91e9f1 (patch) | |
tree | 6b8b9234f9b18f262289ff26b56f7fab6e8b467e /roles/openshift_facts | |
parent | 643d1d60919e3f2a258744e0c0b7b3a9105f9828 (diff) | |
parent | 42dfc8eefd8c036f91b352eff98df714085d777e (diff) | |
download | openshift-e6bec56b75baa631cdb4902d29cca811db91e9f1.tar.gz openshift-e6bec56b75baa631cdb4902d29cca811db91e9f1.tar.bz2 openshift-e6bec56b75baa631cdb4902d29cca811db91e9f1.tar.xz openshift-e6bec56b75baa631cdb4902d29cca811db91e9f1.zip |
Merge pull request #3225 from smarterclayton/fix_gce
GCE deployment fails due to invalid lookup
Diffstat (limited to 'roles/openshift_facts')
-rwxr-xr-x | roles/openshift_facts/library/openshift_facts.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py index 3c8e2ab9c..0c7aad81e 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -1019,7 +1019,7 @@ def set_nodename(facts): if 'cloudprovider' in facts and facts['cloudprovider']['kind'] == 'openstack': facts['node']['nodename'] = facts['provider']['metadata']['hostname'].replace('.novalocal', '') elif 'cloudprovider' in facts and facts['cloudprovider']['kind'] == 'gce': - facts['node']['nodename'] = '.'.split(facts['provider']['metadata']['hostname'])[0] + facts['node']['nodename'] = facts['provider']['metadata']['instance']['hostname'].split('.')[0] else: facts['node']['nodename'] = facts['common']['hostname'].lower() return facts |