Regenerate nova.conf.sample
Fix generate_sample.sh script so that we include options from the bin/ scripts too. In order to make this work, sync a zmq-receive fix from oslo-incubator to delay parsing its config file. Change-Id: Ia3f9083b2ebc16425dbad8a2a55c2d45f1ff2be3
This commit is contained in:
@@ -39,10 +39,10 @@ from nova.openstack.common.rpc import impl_zmq
|
|||||||
CONF = cfg.CONF
|
CONF = cfg.CONF
|
||||||
CONF.register_opts(rpc.rpc_opts)
|
CONF.register_opts(rpc.rpc_opts)
|
||||||
CONF.register_opts(impl_zmq.zmq_opts)
|
CONF.register_opts(impl_zmq.zmq_opts)
|
||||||
CONF(sys.argv[1:], project='nova')
|
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
|
CONF(sys.argv[1:], project='nova')
|
||||||
logging.setup("nova")
|
logging.setup("nova")
|
||||||
|
|
||||||
with contextlib.closing(impl_zmq.ZmqProxy(CONF)) as reactor:
|
with contextlib.closing(impl_zmq.ZmqProxy(CONF)) as reactor:
|
||||||
|
|||||||
Reference in New Issue
Block a user