Merge "Use correct hostname to get instances."

This commit is contained in:
Jenkins 2013-07-15 22:07:04 +00:00 committed by Gerrit Code Review
commit b87a7d37ef

View File

@ -31,7 +31,7 @@ from ceilometer.openstack.common import rpc
cfg.CONF.register_opts([
cfg.StrOpt('host',
default=socket.getfqdn(),
default=socket.gethostname(),
help='Name of this node. This can be an opaque identifier. '
'It is not necessarily a hostname, FQDN, or IP address. '
'However, the node name must be valid within '