From 9988ca4d5dcef6cbefa6d11f6b68913a0993b0b2 Mon Sep 17 00:00:00 2001
From: Mark McLoughlin <markmc@redhat.com>
Date: Sat, 23 Feb 2013 18:19:44 +0000
Subject: [PATCH] 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
---
 bin/nova-rpc-zmq-receiver | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/nova-rpc-zmq-receiver b/bin/nova-rpc-zmq-receiver
index b3538b8e..7995fbe8 100755
--- a/bin/nova-rpc-zmq-receiver
+++ b/bin/nova-rpc-zmq-receiver
@@ -39,10 +39,10 @@ from nova.openstack.common.rpc import impl_zmq
 CONF = cfg.CONF
 CONF.register_opts(rpc.rpc_opts)
 CONF.register_opts(impl_zmq.zmq_opts)
-CONF(sys.argv[1:], project='nova')
 
 
 def main():
+    CONF(sys.argv[1:], project='nova')
     logging.setup("nova")
 
     with contextlib.closing(impl_zmq.ZmqProxy(CONF)) as reactor: