summaryrefslogtreecommitdiffstats
path: root/nova/console
diff options
context:
space:
mode:
authorLuis Fernandez Alvarez <luis.fernandez.alvarez@cern.ch>2012-09-25 17:33:59 +0200
committerLuis Fernandez Alvarez <luis.fernandez.alvarez@cern.ch>2012-09-26 13:43:16 +0200
commit5dd1553cca7f7e62eebce75e1d936fc211b239ec (patch)
tree0baa1235bf1c86d9f3a3f821f53db92e5012f5dd /nova/console
parentc367fa5e4a5e4712bde9fc319ae6c2f4f2add606 (diff)
downloadnova-5dd1553cca7f7e62eebce75e1d936fc211b239ec.tar.gz
nova-5dd1553cca7f7e62eebce75e1d936fc211b239ec.tar.xz
nova-5dd1553cca7f7e62eebce75e1d936fc211b239ec.zip
Replaced default hostname function from gethostname to getfqdn
Fixes bug 1055503 The standard behaviour of the 'gethostname' function in Python differs from Linux to Windows. A common Linux configuration returns the FQDN, while a Windows one returns only the host name. To resolve inconsistent node naming in deployments that mix windows and Linux, it is proposed to use 'getfqdn' as default function instead of 'gethostname'. This is function is more predictable in all cases. Change-Id: I3164d9a36df2b8484bbf9a57879c31fa0e342503
Diffstat (limited to 'nova/console')
-rw-r--r--nova/console/manager.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/console/manager.py b/nova/console/manager.py
index 2352adcca..faaf58d0c 100644
--- a/nova/console/manager.py
+++ b/nova/console/manager.py
@@ -37,7 +37,7 @@ console_manager_opts = [
default=False,
help='Stub calls to compute worker for tests'),
cfg.StrOpt('console_public_hostname',
- default=socket.gethostname(),
+ default=socket.getfqdn(),
help='Publicly visible name for this console host'),
]