Browse code

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>

Russell Bryant authored on 2015/06/09 22:14:13
Showing 1 changed files
... ...
@@ -733,19 +733,13 @@ function start_neutron_other_agents {
733 733
     fi
734 734
 
735 735
     run_process q-meta "python $AGENT_META_BINARY --config-file $NEUTRON_CONF --config-file=$Q_META_CONF_FILE"
736
+    run_process q-lbaas "python $AGENT_LBAAS_BINARY --config-file $NEUTRON_CONF --config-file=$LBAAS_AGENT_CONF_FILENAME"
737
+    run_process q-metering "python $AGENT_METERING_BINARY --config-file $NEUTRON_CONF --config-file $METERING_AGENT_CONF_FILENAME"
736 738
 
737 739
     if [ "$VIRT_DRIVER" = 'xenserver' ]; then
738 740
         # For XenServer, start an agent for the domU openvswitch
739 741
         run_process q-domua "python $AGENT_BINARY --config-file $NEUTRON_CONF --config-file /$Q_PLUGIN_CONF_FILE.domU"
740 742
     fi
741
-
742
-    if is_service_enabled q-lbaas; then
743
-        run_process q-lbaas "python $AGENT_LBAAS_BINARY --config-file $NEUTRON_CONF --config-file=$LBAAS_AGENT_CONF_FILENAME"
744
-    fi
745
-
746
-    if is_service_enabled q-metering; then
747
-        run_process q-metering "python $AGENT_METERING_BINARY --config-file $NEUTRON_CONF --config-file $METERING_AGENT_CONF_FILENAME"
748
-    fi
749 743
 }
750 744
 
751 745
 # Start running processes, including screen