summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-22 19:08:48 -0700
committerGitHub <noreply@github.com>2017-09-22 19:08:48 -0700
commitd407d4fc3cb1d76d7fef52088e2459a420952c16 (patch)
tree12aa238700432e2e38774c1d7f7490fdc02c4190
parent6bee051f9850b6393edc60860993d84cf1e38989 (diff)
parent16be0f2eb09b2e4c2b14864ba83195866479f917 (diff)
downloadopenshift-d407d4fc3cb1d76d7fef52088e2459a420952c16.tar.gz
openshift-d407d4fc3cb1d76d7fef52088e2459a420952c16.tar.bz2
openshift-d407d4fc3cb1d76d7fef52088e2459a420952c16.tar.xz
openshift-d407d4fc3cb1d76d7fef52088e2459a420952c16.zip
Merge pull request #5483 from sdodson/bz1396350
Automatic merge from submit-queue Ensure that hostname is lowercase Fixes https://bugzilla.redhat.com/show_bug.cgi?id=1396350
-rwxr-xr-xroles/openshift_facts/library/openshift_facts.py2
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 b6e7507ff..1c2c91a5a 100755
--- a/roles/openshift_facts/library/openshift_facts.py
+++ b/roles/openshift_facts/library/openshift_facts.py
@@ -1905,7 +1905,7 @@ class OpenShiftFacts(object):
hostname_f = output.strip() if exit_code == 0 else ''
hostname_values = [hostname_f, self.system_facts['ansible_nodename'],
self.system_facts['ansible_fqdn']]
- hostname = choose_hostname(hostname_values, ip_addr)
+ hostname = choose_hostname(hostname_values, ip_addr).lower()
defaults['common'] = dict(ip=ip_addr,
public_ip=ip_addr,