diff options
| author | Luis Fernandez Alvarez <luis.fernandez.alvarez@cern.ch> | 2012-09-25 17:33:59 +0200 |
|---|---|---|
| committer | Luis Fernandez Alvarez <luis.fernandez.alvarez@cern.ch> | 2012-09-26 13:43:16 +0200 |
| commit | 5dd1553cca7f7e62eebce75e1d936fc211b239ec (patch) | |
| tree | 0baa1235bf1c86d9f3a3f821f53db92e5012f5dd /nova/openstack | |
| parent | c367fa5e4a5e4712bde9fc319ae6c2f4f2add606 (diff) | |
| download | nova-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/openstack')
| -rw-r--r-- | nova/openstack/common/rpc/impl_zmq.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/openstack/common/rpc/impl_zmq.py b/nova/openstack/common/rpc/impl_zmq.py index 4ffb1ae69..f3fa44c18 100644 --- a/nova/openstack/common/rpc/impl_zmq.py +++ b/nova/openstack/common/rpc/impl_zmq.py @@ -64,7 +64,7 @@ zmq_opts = [ cfg.StrOpt('rpc_zmq_ipc_dir', default='/var/run/openstack', help='Directory for holding IPC sockets'), - cfg.StrOpt('rpc_zmq_host', default=socket.gethostname(), + cfg.StrOpt('rpc_zmq_host', default=socket.getfqdn(), help='Name of this node. Must be a valid hostname, FQDN, or ' 'IP address. Must match "host" option, if running Nova.') ] |