commit cda59003d736c6ff4d87621efcf94992e9dfb3e4
author Jenkins <jenkins@review.openstack.org> Wed Aug 15 20:35:58 2012 +0000
committer Gerrit Code Review <review@openstack.org> Wed Aug 15 20:35:58 2012 +0000
tree 60955bcbb2e80f0a6e9620fb8491c8f1633a266d
parent 839d370c05093fd03e9ce9e137862b0f6609d1de
parent 2053753baf197bd1f7f51b361eda24910b3f7c94

Merge "Update stack.sh to pass quantum.conf to DHCP agent"

stack.sh

diff --git a/stack.sh b/stack.sh
index b091fe3..7888d77 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1233,7 +1233,7 @@
 screen_it q-agt "sudo python $AGENT_BINARY --config-file $Q_CONF_FILE --config-file /$Q_PLUGIN_CONF_FILE"
 
 # Start up the quantum agent
-screen_it q-dhcp "sudo python $AGENT_DHCP_BINARY --config-file=$Q_DHCP_CONF_FILE"
+screen_it q-dhcp "sudo python $AGENT_DHCP_BINARY --config-file $Q_CONF_FILE --config-file=$Q_DHCP_CONF_FILE"
 
 # Nova
 # ----