Browse code

Merge "Simplify start_neutron_other_agents"

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