summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLénaïc Huard <lhuard@amadeus.com>2016-10-06 14:39:18 +0200
committerLénaïc Huard <lhuard@amadeus.com>2016-10-06 14:39:18 +0200
commit3cc2d6b019fa8a05ba480a7425cd654aa051355f (patch)
tree34a0eb2be8036dc14ed324af06337a7c860d5c9a
parent0c01e07493a4660f3eade5b96abefaa5b1f062b9 (diff)
downloadopenshift-3cc2d6b019fa8a05ba480a7425cd654aa051355f.tar.gz
openshift-3cc2d6b019fa8a05ba480a7425cd654aa051355f.tar.bz2
openshift-3cc2d6b019fa8a05ba480a7425cd654aa051355f.tar.xz
openshift-3cc2d6b019fa8a05ba480a7425cd654aa051355f.zip
Check that OpenStack hostnames are resolvable
If they’re not, then use IP instead
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py15
1 files changed, 9 insertions, 6 deletions
diff --git a/roles/openshift_facts/library/openshift_facts.py b/roles/openshift_facts/library/openshift_facts.py
index 9ffd399bc..0ee018c5c 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -364,12 +364,15 @@ def normalize_openstack_facts(metadata, facts):
facts['network']['ip'] = local_ipv4
facts['network']['public_ip'] = metadata['ec2_compat']['public-ipv4']
- # TODO: verify local hostname makes sense and is resolvable
- facts['network']['hostname'] = metadata['hostname']
-
- # TODO: verify that public hostname makes sense and is resolvable
- pub_h = metadata['ec2_compat']['public-hostname']
- facts['network']['public_hostname'] = pub_h
+ for f_var, h_var, ip_var in [('hostname', 'hostname', 'local-ipv4'),
+ ('public_hostname', 'public-hostname', 'public-ipv4')]:
+ try:
+ if socket.gethostbyname(metadata['ec2_compat'][h_var]) == metadata['ec2_compat'][ip_var]:
+ facts['network'][f_var] = metadata['ec2_compat'][h_var]
+ else:
+ facts['network'][f_var] = metadata['ec2_compat'][ip_var]
+ except socket.gaierror:
+ facts['network'][f_var] = metadata['ec2_compat'][ip_var]
return facts