commit 43eb8f823f0bf0e6e2385360f5eeb89a9fef9ac8
author Jenkins <jenkins@review.openstack.org> Wed Feb 27 17:37:26 2013 +0000
committer Gerrit Code Review <review@openstack.org> Wed Feb 27 17:37:26 2013 +0000
tree 0f45f74c9e8c9b2e406eaa2c30e9b4ddfd1576b1
parent 40a87d4103ef13a00a026175b725b06bae6036f7
parent 241d74e67095604c090265f0bf0fac6d4109a056

Merge "Remove duplicate package"

lib/quantum

diff --git a/lib/quantum b/lib/quantum
index 0fef1ae..3466162 100644
--- a/lib/quantum
+++ b/lib/quantum
@@ -442,7 +442,6 @@
     iniset $Q_DHCP_CONF_FILE DEFAULT verbose True
     iniset $Q_DHCP_CONF_FILE DEFAULT debug True
     iniset $Q_DHCP_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE
-    iniset $Q_DHCP_CONF_FILE DEFAULT state_path $DATA_DIR/quantum
     iniset $Q_DHCP_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"
 
     _quantum_setup_keystone $Q_DHCP_CONF_FILE DEFAULT set_auth_url
@@ -464,7 +463,6 @@
     iniset $Q_L3_CONF_FILE DEFAULT verbose True
     iniset $Q_L3_CONF_FILE DEFAULT debug True
     iniset $Q_L3_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE
-    iniset $Q_L3_CONF_FILE DEFAULT state_path $DATA_DIR/quantum
     iniset $Q_L3_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"
 
     _quantum_setup_keystone $Q_L3_CONF_FILE DEFAULT set_auth_url
@@ -481,7 +479,6 @@
 
     iniset $Q_META_CONF_FILE DEFAULT verbose True
     iniset $Q_META_CONF_FILE DEFAULT debug True
-    iniset $Q_META_CONF_FILE DEFAULT state_path $DATA_DIR/quantum
     iniset $Q_META_CONF_FILE DEFAULT nova_metadata_ip $Q_META_DATA_IP
     iniset $Q_META_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"
 
@@ -520,6 +517,7 @@
 
     iniset $QUANTUM_CONF DEFAULT verbose True
     iniset $QUANTUM_CONF DEFAULT debug True
+    iniset $QUANTUM_CONF DEFAULT state_path $DATA_DIR/quantum
     iniset $QUANTUM_CONF DEFAULT allow_overlapping_ips $Q_ALLOW_OVERLAPPING_IP
 
     iniset $QUANTUM_CONF DEFAULT auth_strategy $Q_AUTH_STRATEGY