Skip to content

Commit

Permalink
Merge pull request #11014 from tzumainn/3.9-openstack-ec2-var-fix
Browse files Browse the repository at this point in the history
[release 3.9] fix openstack facts when ec2 var is empty
  • Loading branch information
openshift-merge-robot committed Jan 16, 2019
2 parents 797ae8a + 990c29a commit 83c3215
Showing 1 changed file with 7 additions and 3 deletions.
10 changes: 7 additions & 3 deletions roles/openshift_facts/library/openshift_facts.py
Original file line number Diff line number Diff line change
Expand Up @@ -336,13 +336,17 @@ def normalize_openstack_facts(metadata, facts):

for f_var, h_var, ip_var in [('hostname', 'hostname', 'local-ipv4'),
('public_hostname', 'public-hostname', 'public-ipv4')]:
if metadata['ec2_compat'][ip_var] == []:
metadata_ip_var = ""
else:
metadata_ip_var = metadata['ec2_compat'][ip_var].split(',')[0]
try:
if socket.gethostbyname(metadata['ec2_compat'][h_var]) == metadata['ec2_compat'][ip_var].split(',')[0]:
if socket.gethostbyname(metadata['ec2_compat'][h_var]) == metadata_ip_var:
facts['network'][f_var] = metadata['ec2_compat'][h_var]
else:
facts['network'][f_var] = metadata['ec2_compat'][ip_var].split(',')[0]
facts['network'][f_var] = metadata_ip_var
except socket.gaierror:
facts['network'][f_var] = metadata['ec2_compat'][ip_var].split(',')[0]
facts['network'][f_var] = metadata_ip_var

return facts

Expand Down

0 comments on commit 83c3215

Please sign in to comment.