Home Explore Help
Register Sign In
shixiong
/
okd
1
0
Fork 0
Files Issues 0 Pull Requests 0 Wiki
Browse Source

Merge pull request #347 from detiber/fixHostnameFact

Fix hostname default when valid hostname not found on system
Thomas Wiest 9 years ago
parent
68d6fdf1c1 97212a2656
commit
7c5e6ad3d6
1 changed files with 1 additions and 1 deletions
Split View Show Diff Stats
  1. 1 1
      roles/openshift_facts/library/openshift_facts.py

+ 1 - 1
roles/openshift_facts/library/openshift_facts.py
View File 

@@ -693,7 +693,7 @@ class OpenShiftFacts(object):
 
         hostname_f = output.strip() if exit_code == 0 else ''
 
         hostname_values = [hostname_f, self.system_facts['nodename'],
 
                            self.system_facts['fqdn']]
 
-        hostname = choose_hostname(hostname_values)
 
+        hostname = choose_hostname(hostname_values, ip_addr)
 
 
         common = dict(use_openshift_sdn=True, ip=ip_addr, public_ip=ip_addr,
 
                       deployment_type='origin', hostname=hostname,