Browse code
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
Akihiro MOTOKI authored on 2013/02/26 14:50:56Showing 1 changed files
| ... | ... |
@@ -442,7 +442,6 @@ function _configure_quantum_dhcp_agent() {
|
| 442 | 442 |
iniset $Q_DHCP_CONF_FILE DEFAULT verbose True |
| 443 | 443 |
iniset $Q_DHCP_CONF_FILE DEFAULT debug True |
| 444 | 444 |
iniset $Q_DHCP_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE |
| 445 |
- iniset $Q_DHCP_CONF_FILE DEFAULT state_path $DATA_DIR/quantum |
|
| 446 | 445 |
iniset $Q_DHCP_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND" |
| 447 | 446 |
|
| 448 | 447 |
_quantum_setup_keystone $Q_DHCP_CONF_FILE DEFAULT set_auth_url |
| ... | ... |
@@ -464,7 +463,6 @@ function _configure_quantum_l3_agent() {
|
| 464 | 464 |
iniset $Q_L3_CONF_FILE DEFAULT verbose True |
| 465 | 465 |
iniset $Q_L3_CONF_FILE DEFAULT debug True |
| 466 | 466 |
iniset $Q_L3_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE |
| 467 |
- iniset $Q_L3_CONF_FILE DEFAULT state_path $DATA_DIR/quantum |
|
| 468 | 467 |
iniset $Q_L3_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND" |
| 469 | 468 |
|
| 470 | 469 |
_quantum_setup_keystone $Q_L3_CONF_FILE DEFAULT set_auth_url |
| ... | ... |
@@ -481,7 +479,6 @@ function _configure_quantum_metadata_agent() {
|
| 481 | 481 |
|
| 482 | 482 |
iniset $Q_META_CONF_FILE DEFAULT verbose True |
| 483 | 483 |
iniset $Q_META_CONF_FILE DEFAULT debug True |
| 484 |
- iniset $Q_META_CONF_FILE DEFAULT state_path $DATA_DIR/quantum |
|
| 485 | 484 |
iniset $Q_META_CONF_FILE DEFAULT nova_metadata_ip $Q_META_DATA_IP |
| 486 | 485 |
iniset $Q_META_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND" |
| 487 | 486 |
|
| ... | ... |
@@ -520,6 +517,7 @@ function _configure_quantum_service() {
|
| 520 | 520 |
|
| 521 | 521 |
iniset $QUANTUM_CONF DEFAULT verbose True |
| 522 | 522 |
iniset $QUANTUM_CONF DEFAULT debug True |
| 523 |
+ iniset $QUANTUM_CONF DEFAULT state_path $DATA_DIR/quantum |
|
| 523 | 524 |
iniset $QUANTUM_CONF DEFAULT allow_overlapping_ips $Q_ALLOW_OVERLAPPING_IP |
| 524 | 525 |
|
| 525 | 526 |
iniset $QUANTUM_CONF DEFAULT auth_strategy $Q_AUTH_STRATEGY |