Browse code
Remove unused keystone params from neutron agents' config files
DHCP, L3 and Metadata agents' config files no longer need to
duplicate this info; it's available in neutron.conf
Change-Id: I7bea25d1c2b9249ddacce3f4638f7a8ed4f43197
armando-migliaccio authored on 2013/08/02 02:44:22Showing 1 changed files
| ... | ... |
@@ -523,7 +523,6 @@ function _configure_neutron_debug_command() {
|
| 523 | 523 |
# be cleaned. |
| 524 | 524 |
iniset $NEUTRON_TEST_CONFIG_FILE agent root_helper "$Q_RR_COMMAND" |
| 525 | 525 |
|
| 526 |
- _neutron_setup_keystone $NEUTRON_TEST_CONFIG_FILE DEFAULT set_auth_url |
|
| 527 | 526 |
_neutron_setup_interface_driver $NEUTRON_TEST_CONFIG_FILE |
| 528 | 527 |
|
| 529 | 528 |
neutron_plugin_configure_debug_command |
| ... | ... |
@@ -540,7 +539,6 @@ function _configure_neutron_dhcp_agent() {
|
| 540 | 540 |
iniset $Q_DHCP_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE |
| 541 | 541 |
iniset $Q_DHCP_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND" |
| 542 | 542 |
|
| 543 |
- _neutron_setup_keystone $Q_DHCP_CONF_FILE DEFAULT set_auth_url |
|
| 544 | 543 |
_neutron_setup_interface_driver $Q_DHCP_CONF_FILE |
| 545 | 544 |
|
| 546 | 545 |
neutron_plugin_configure_dhcp_agent |
| ... | ... |
@@ -561,7 +559,6 @@ function _configure_neutron_l3_agent() {
|
| 561 | 561 |
iniset $Q_L3_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE |
| 562 | 562 |
iniset $Q_L3_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND" |
| 563 | 563 |
|
| 564 |
- _neutron_setup_keystone $Q_L3_CONF_FILE DEFAULT set_auth_url |
|
| 565 | 564 |
_neutron_setup_interface_driver $Q_L3_CONF_FILE |
| 566 | 565 |
|
| 567 | 566 |
neutron_plugin_configure_l3_agent |
| ... | ... |
@@ -578,7 +575,6 @@ function _configure_neutron_metadata_agent() {
|
| 578 | 578 |
iniset $Q_META_CONF_FILE DEFAULT nova_metadata_ip $Q_META_DATA_IP |
| 579 | 579 |
iniset $Q_META_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND" |
| 580 | 580 |
|
| 581 |
- _neutron_setup_keystone $Q_META_CONF_FILE DEFAULT set_auth_url |
|
| 582 | 581 |
} |
| 583 | 582 |
|
| 584 | 583 |
function _configure_neutron_lbaas() {
|