Browse code

Merge "Enable multi-agent support"

Jenkins authored on 2013/03/21 01:46:25
Showing 1 changed files
... ...
@@ -415,6 +415,7 @@ function _configure_quantum_common() {
415 415
     cp $QUANTUM_DIR/$Q_PLUGIN_CONF_FILE /$Q_PLUGIN_CONF_FILE
416 416
 
417 417
     iniset /$Q_PLUGIN_CONF_FILE DATABASE sql_connection `database_connection_url $Q_DB_NAME`
418
+    iniset $QUANTUM_CONF DEFAULT state_path $DATA_DIR/quantum
418 419
 
419 420
     _quantum_setup_rootwrap
420 421
 }
... ...
@@ -534,7 +535,6 @@ function _configure_quantum_service() {
534 534
 
535 535
     iniset $QUANTUM_CONF DEFAULT verbose True
536 536
     iniset $QUANTUM_CONF DEFAULT debug True
537
-    iniset $QUANTUM_CONF DEFAULT state_path $DATA_DIR/quantum
538 537
     iniset $QUANTUM_CONF DEFAULT policy_file $Q_POLICY_FILE
539 538
     iniset $QUANTUM_CONF DEFAULT allow_overlapping_ips $Q_ALLOW_OVERLAPPING_IP
540 539