commit cfbc7918c5e7720fcfba88d2c18d26dd9d0cf5cf
author Russell Bryant <rbryant@redhat.com> Tue Jun 09 09:14:13 2015 -0400
committer Russell Bryant <rbryant@redhat.com> Wed Jun 10 08:27:26 2015 -0400
tree ed4f12d96f8a97ae1bb7bdb01920ea3a133f348e
parent 09b94603bb4f903616da3b1b4970ee1e2a666b91

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 <rbryant@redhat.com>

lib/neutron-legacy

diff --git a/lib/neutron-legacy b/lib/neutron-legacy
index 519200b..87674b3 100644
--- a/lib/neutron-legacy
+++ b/lib/neutron-legacy
@@ -733,19 +733,13 @@
     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