From 3c6e9a5ac20d60e915d6d54cce3a0ac65da85108 Mon Sep 17 00:00:00 2001 From: Akihiro MOTOKI Date: Tue, 26 Feb 2013 14:50:56 +0900 Subject: [PATCH] Set state_path to quantum.conf This change is required to make quantum security groups support of OVS/LinuxBridge plugins work. Previously state_path was configured in each agent config files in Quantum, but it is moved to quantum.conf. This change follows it. Change-Id: I290dc98878661375cf8a31a53d857433de0e5462 --- lib/quantum | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/quantum b/lib/quantum index 0fef1aebd0..3466162fea 100644 --- a/lib/quantum +++ b/lib/quantum @@ -442,7 +442,6 @@ function _configure_quantum_dhcp_agent() { 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 @@ function _configure_quantum_l3_agent() { 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 @@ function _configure_quantum_metadata_agent() { 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 @@ function _configure_quantum_service() { 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