@@ -979,7 +979,7 @@ function _configure_neutron_dhcp_agent {

     iniset $Q_DHCP_CONF_FILE DEFAULT verbose True

     iniset $Q_DHCP_CONF_FILE DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

     iniset $Q_DHCP_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE

-    iniset $Q_DHCP_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"

+    iniset $Q_DHCP_CONF_FILE agent root_helper "$Q_RR_COMMAND"

     if [[ "$Q_USE_ROOTWRAP_DAEMON" == "True" ]]; then

         iniset $Q_DHCP_CONF_FILE agent root_helper_daemon "$Q_RR_DAEMON_COMMAND"

     fi

@@ -1014,7 +1014,7 @@ function _configure_neutron_l3_agent {

     iniset $Q_L3_CONF_FILE DEFAULT verbose True

     iniset $Q_L3_CONF_FILE DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

     iniset $Q_L3_CONF_FILE DEFAULT use_namespaces $Q_USE_NAMESPACE

-    iniset $Q_L3_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"

+    iniset $Q_L3_CONF_FILE agent root_helper "$Q_RR_COMMAND"

     if [[ "$Q_USE_ROOTWRAP_DAEMON" == "True" ]]; then

         iniset $Q_L3_CONF_FILE agent root_helper_daemon "$Q_RR_DAEMON_COMMAND"

     fi

@@ -1038,7 +1038,7 @@ function _configure_neutron_metadata_agent {

     iniset $Q_META_CONF_FILE DEFAULT verbose True

     iniset $Q_META_CONF_FILE DEFAULT debug $ENABLE_DEBUG_LOG_LEVEL

     iniset $Q_META_CONF_FILE DEFAULT nova_metadata_ip $Q_META_DATA_IP

-    iniset $Q_META_CONF_FILE DEFAULT root_helper "$Q_RR_COMMAND"

+    iniset $Q_META_CONF_FILE agent root_helper "$Q_RR_COMMAND"

     if [[ "$Q_USE_ROOTWRAP_DAEMON" == "True" ]]; then

         iniset $Q_META_CONF_FILE agent root_helper_daemon "$Q_RR_DAEMON_COMMAND"

     fi