diff options
| author | Thomas Wiest <twiest@users.noreply.github.com> | 2015-07-16 12:19:29 -0400 |
|---|---|---|
| committer | Thomas Wiest <twiest@users.noreply.github.com> | 2015-07-16 12:19:29 -0400 |
| commit | 7c5e6ad3d6df45f53a023e24215b6fba7f93571a (patch) | |
| tree | 8e480f068f55cad469e585c5b85ec93998beb7bf /roles/openshift_facts | |
| parent | 68d6fdf1c1c8244b3bd2ccdf77499d9127592368 (diff) | |
| parent | 97212a26564f7af8365f1ffea7f251ddffa491b8 (diff) | |
| download | openshift-7c5e6ad3d6df45f53a023e24215b6fba7f93571a.tar.gz openshift-7c5e6ad3d6df45f53a023e24215b6fba7f93571a.tar.bz2 openshift-7c5e6ad3d6df45f53a023e24215b6fba7f93571a.tar.xz openshift-7c5e6ad3d6df45f53a023e24215b6fba7f93571a.zip | |
Merge pull request #347 from detiber/fixHostnameFact
Fix hostname default when valid hostname not found on system
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 aff822a23..727861b07 100755 --- a/roles/openshift_facts/library/openshift_facts.py +++ b/roles/openshift_facts/library/openshift_facts.py @@ -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, |