diff options
| author | Jenkins <jenkins@review.openstack.org> | 2012-09-26 23:13:50 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2012-09-26 23:13:50 +0000 |
| commit | be3c54ee0d886c38f125727beba3a72b75bb32e6 (patch) | |
| tree | 588f330da402bc8456ac7131dce7fafb0e9fe327 /nova/openstack | |
| parent | ba7083030c22bb4fcdc323a2c12bcdf764fa375e (diff) | |
| parent | 5dd1553cca7f7e62eebce75e1d936fc211b239ec (diff) | |
| download | nova-be3c54ee0d886c38f125727beba3a72b75bb32e6.tar.gz nova-be3c54ee0d886c38f125727beba3a72b75bb32e6.tar.xz nova-be3c54ee0d886c38f125727beba3a72b75bb32e6.zip | |
Merge "Replaced default hostname function from gethostname to getfqdn"
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.') ] |