summaryrefslogtreecommitdiffstats
path: root/openstack/common
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-07-16 13:31:05 +0000
committerGerrit Code Review <review@openstack.org>2012-07-16 13:31:05 +0000
commit2adaf2ffafdb67bd237578f094b78d15da17b772 (patch)
treea2c2480fd0eec49eb53120ed5910eb8000e7df90 /openstack/common
parent7b43a748dda0813a601aa3a81ecb04cee6505601 (diff)
parent2ab4f39c19e32d17f84f52e1bee7ba340edf3777 (diff)
downloadoslo-2adaf2ffafdb67bd237578f094b78d15da17b772.tar.gz
oslo-2adaf2ffafdb67bd237578f094b78d15da17b772.tar.xz
oslo-2adaf2ffafdb67bd237578f094b78d15da17b772.zip
Merge "Add additional usage info on rpc_zmq_host flag"
Diffstat (limited to 'openstack/common')
-rw-r--r--openstack/common/rpc/impl_zmq.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/openstack/common/rpc/impl_zmq.py b/openstack/common/rpc/impl_zmq.py
index b8cc959..ba54cfa 100644
--- a/openstack/common/rpc/impl_zmq.py
+++ b/openstack/common/rpc/impl_zmq.py
@@ -63,9 +63,10 @@ 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(),
help='Name of this node. Must be a valid hostname, FQDN, or '
- 'IP address')
+ 'IP address. Must match "host" option, if running Nova.')
]