From cfbc7918c5e7720fcfba88d2c18d26dd9d0cf5cf Mon Sep 17 00:00:00 2001 From: Russell Bryant Date: Tue, 9 Jun 2015 09:14:13 -0400 Subject: [PATCH] Simplify start_neutron_other_agents This patch just simplifies the start function a bit by removing some unnecessary is_service_enabled checks that just wrap run_process calls. run_process does this exact check internally so it's not needed here. Change-Id: Id12a23f77ea0342854337c7d65821dd4e574dec2 Signed-off-by: Russell Bryant --- lib/neutron-legacy | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/lib/neutron-legacy b/lib/neutron-legacy index 519200bbcb..87674b309a 100644 --- a/lib/neutron-legacy +++ b/lib/neutron-legacy @@ -733,19 +733,13 @@ function start_neutron_other_agents { fi run_process q-meta "python $AGENT_META_BINARY --config-file $NEUTRON_CONF --config-file=$Q_META_CONF_FILE" + run_process q-lbaas "python $AGENT_LBAAS_BINARY --config-file $NEUTRON_CONF --config-file=$LBAAS_AGENT_CONF_FILENAME" + run_process q-metering "python $AGENT_METERING_BINARY --config-file $NEUTRON_CONF --config-file $METERING_AGENT_CONF_FILENAME" if [ "$VIRT_DRIVER" = 'xenserver' ]; then # For XenServer, start an agent for the domU openvswitch run_process q-domua "python $AGENT_BINARY --config-file $NEUTRON_CONF --config-file /$Q_PLUGIN_CONF_FILE.domU" fi - - if is_service_enabled q-lbaas; then - run_process q-lbaas "python $AGENT_LBAAS_BINARY --config-file $NEUTRON_CONF --config-file=$LBAAS_AGENT_CONF_FILENAME" - fi - - if is_service_enabled q-metering; then - run_process q-metering "python $AGENT_METERING_BINARY --config-file $NEUTRON_CONF --config-file $METERING_AGENT_CONF_FILENAME" - fi } # Start running processes, including screen