First noted in change id by fumihiko and kyle:
I079e18b58b214bf8362945c253d6d894ca8b1a6b
Neutron and few others seem to use an extra "python" along
with run_process which is quite unnecessary and complicates
adding python3 support in devstack. So let's clean this up.
Change-Id: I2d478f2b04c04d05c18420563e2ad77eba73be3f
... | ... |
@@ -687,7 +687,7 @@ function start_neutron_service_and_check { |
687 | 687 |
service_protocol="http" |
688 | 688 |
fi |
689 | 689 |
# Start the Neutron service |
690 |
- run_process q-svc "python $NEUTRON_BIN_DIR/neutron-server $cfg_file_options" |
|
690 |
+ run_process q-svc "$NEUTRON_BIN_DIR/neutron-server $cfg_file_options" |
|
691 | 691 |
echo "Waiting for Neutron to start..." |
692 | 692 |
if is_ssl_enabled_service "neutron"; then |
693 | 693 |
ssl_ca="--ca-certificate=${SSL_BUNDLE_FILE}" |
... | ... |
@@ -705,7 +705,7 @@ function start_neutron_service_and_check { |
705 | 705 |
# Control of the l2 agent is separated out to make it easier to test partial |
706 | 706 |
# upgrades (everything upgraded except the L2 agent) |
707 | 707 |
function start_neutron_l2_agent { |
708 |
- run_process q-agt "python $AGENT_BINARY --config-file $NEUTRON_CONF --config-file /$Q_PLUGIN_CONF_FILE" |
|
708 |
+ run_process q-agt "$AGENT_BINARY --config-file $NEUTRON_CONF --config-file /$Q_PLUGIN_CONF_FILE" |
|
709 | 709 |
|
710 | 710 |
if is_provider_network; then |
711 | 711 |
sudo ovs-vsctl --no-wait -- --may-exist add-port $OVS_PHYSICAL_BRIDGE $PUBLIC_INTERFACE |
... | ... |
@@ -723,23 +723,23 @@ function start_neutron_l2_agent { |
723 | 723 |
} |
724 | 724 |
|
725 | 725 |
function start_neutron_other_agents { |
726 |
- run_process q-dhcp "python $AGENT_DHCP_BINARY --config-file $NEUTRON_CONF --config-file=$Q_DHCP_CONF_FILE" |
|
726 |
+ run_process q-dhcp "$AGENT_DHCP_BINARY --config-file $NEUTRON_CONF --config-file=$Q_DHCP_CONF_FILE" |
|
727 | 727 |
|
728 | 728 |
if is_service_enabled neutron-vpnaas; then |
729 | 729 |
: # Started by plugin |
730 | 730 |
elif is_service_enabled q-vpn; then |
731 | 731 |
run_process q-vpn "$AGENT_VPN_BINARY $(determine_config_files neutron-vpn-agent)" |
732 | 732 |
else |
733 |
- run_process q-l3 "python $AGENT_L3_BINARY $(determine_config_files neutron-l3-agent)" |
|
733 |
+ run_process q-l3 "$AGENT_L3_BINARY $(determine_config_files neutron-l3-agent)" |
|
734 | 734 |
fi |
735 | 735 |
|
736 |
- run_process q-meta "python $AGENT_META_BINARY --config-file $NEUTRON_CONF --config-file=$Q_META_CONF_FILE" |
|
737 |
- run_process q-lbaas "python $AGENT_LBAAS_BINARY --config-file $NEUTRON_CONF --config-file=$LBAAS_AGENT_CONF_FILENAME" |
|
738 |
- run_process q-metering "python $AGENT_METERING_BINARY --config-file $NEUTRON_CONF --config-file $METERING_AGENT_CONF_FILENAME" |
|
736 |
+ run_process q-meta "$AGENT_META_BINARY --config-file $NEUTRON_CONF --config-file=$Q_META_CONF_FILE" |
|
737 |
+ run_process q-lbaas "$AGENT_LBAAS_BINARY --config-file $NEUTRON_CONF --config-file=$LBAAS_AGENT_CONF_FILENAME" |
|
738 |
+ run_process q-metering "$AGENT_METERING_BINARY --config-file $NEUTRON_CONF --config-file $METERING_AGENT_CONF_FILENAME" |
|
739 | 739 |
|
740 | 740 |
if [ "$VIRT_DRIVER" = 'xenserver' ]; then |
741 | 741 |
# For XenServer, start an agent for the domU openvswitch |
742 |
- run_process q-domua "python $AGENT_BINARY --config-file $NEUTRON_CONF --config-file /$Q_PLUGIN_CONF_FILE.domU" |
|
742 |
+ run_process q-domua "$AGENT_BINARY --config-file $NEUTRON_CONF --config-file /$Q_PLUGIN_CONF_FILE.domU" |
|
743 | 743 |
fi |
744 | 744 |
} |
745 | 745 |
|