GitList

Browse code

Force Quantum processes to run in a subshell

Force bash to evaluate the command line passed to screen_it so the
commands are executed in a subshell. This seems to make a difference
when using run_service() when the server process is owned by init.

These Quantum services were the only ones in all of DevStack being
spawned in this manner. This will allow the run_service() patch
https://review.openstack.org/#/c/23148/ to succesfully be merged
and the number of test failures due to screen should be reduced to 0.

Change-Id: I97d562adda51d39a5e7fa1dc4d945d4a396201cd

Dean Troyer authored on 2013/03/20 05:39:47
Showing 1 changed files

lib/quantum

History View file @ 58ab929

@@ -365,13 +365,13 @@ function start_quantum_service_and_check() {
                      # Start running processes, including screen
                      function start_quantum_agents() {
                          # Start up the quantum agents if enabled
                     -    screen_it q-agt "python $AGENT_BINARY --config-file $QUANTUM_CONF --config-file /$Q_PLUGIN_CONF_FILE"
                     -    screen_it q-dhcp "python $AGENT_DHCP_BINARY --config-file $QUANTUM_CONF --config-file=$Q_DHCP_CONF_FILE"
                     -    screen_it q-meta "python $AGENT_META_BINARY --config-file $QUANTUM_CONF --config-file=$Q_META_CONF_FILE"
                     -    screen_it q-l3 "python $AGENT_L3_BINARY --config-file $QUANTUM_CONF --config-file=$Q_L3_CONF_FILE"
                     +    screen_it q-agt "cd $QUANTUM_DIR && python $AGENT_BINARY --config-file $QUANTUM_CONF --config-file /$Q_PLUGIN_CONF_FILE"
                     +    screen_it q-dhcp "cd $QUANTUM_DIR && python $AGENT_DHCP_BINARY --config-file $QUANTUM_CONF --config-file=$Q_DHCP_CONF_FILE"
                     +    screen_it q-l3 "cd $QUANTUM_DIR && python $AGENT_L3_BINARY --config-file $QUANTUM_CONF --config-file=$Q_L3_CONF_FILE"
                     +    screen_it q-meta "cd $QUANTUM_DIR && python $AGENT_META_BINARY --config-file $QUANTUM_CONF --config-file=$Q_META_CONF_FILE"
                          if is_service_enabled q-lbaas; then
                     -        screen_it q-lbaas "python $AGENT_LBAAS_BINARY --config-file $QUANTUM_CONF --config-file=$LBAAS_AGENT_CONF_FILENAME"
                     +        screen_it q-lbaas "cd $QUANTUM_DIR && python $AGENT_LBAAS_BINARY --config-file $QUANTUM_CONF --config-file=$LBAAS_AGENT_CONF_FILENAME"
                          fi
+                     }