Browse code
Merge "_configure_neutron_dhcp_agent: Modify the right config file"
Jenkins authored on 2015/08/17 12:51:09Showing 1 changed files
| ... | ... |
@@ -979,7 +979,7 @@ function _configure_neutron_dhcp_agent {
|
| 979 | 979 |
iniset $Q_DHCP_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE |
| 980 | 980 |
iniset $Q_DHCP_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND" |
| 981 | 981 |
if [[ "$Q_USE_ROOTWRAP_DAEMON" == "True" ]]; then |
| 982 |
- iniset $NEUTRON_TEST_CONFIG_FILE agent root_helper_daemon "$Q_RR_DAEMON_COMMAND" |
|
| 982 |
+ iniset $Q_DHCP_CONF_FILE agent root_helper_daemon "$Q_RR_DAEMON_COMMAND" |
|
| 983 | 983 |
fi |
| 984 | 984 |
|
| 985 | 985 |
if ! is_service_enabled q-l3; then |