@@ -492,7 +492,7 @@ function start_cinder {

                 start_tls_proxy cinder '*' $CINDER_SERVICE_PORT $CINDER_SERVICE_HOST $CINDER_SERVICE_PORT_INT

             fi

         else

-            run_process "c-api" "$CINDER_BIN_DIR/uwsgi --procname-prefix cinder-api --ini $CINDER_UWSGI_CONF"

+            run_process "c-api" "$(which uwsgi) --procname-prefix cinder-api --ini $CINDER_UWSGI_CONF"

             cinder_url=$service_protocol://$SERVICE_HOST/volume/v3

         fi

     fi

@@ -392,7 +392,7 @@ function start_glance {

     run_process g-reg "$GLANCE_BIN_DIR/glance-registry --config-file=$GLANCE_CONF_DIR/glance-registry.conf"

     if [[ "$WSGI_MODE" == "uwsgi" ]]; then

-        run_process g-api "$GLANCE_BIN_DIR/uwsgi --procname-prefix glance-api --ini $GLANCE_UWSGI_CONF"

+        run_process g-api "$(which uwsgi) --procname-prefix glance-api --ini $GLANCE_UWSGI_CONF"

     else

         run_process g-api "$GLANCE_BIN_DIR/glance-api --config-dir=$GLANCE_CONF_DIR"

     fi

@@ -523,7 +523,7 @@ function start_keystone {

         enable_apache_site keystone

         restart_apache_server

     else # uwsgi

-        run_process keystone "$KEYSTONE_BIN_DIR/uwsgi --procname-prefix keystone --ini $KEYSTONE_PUBLIC_UWSGI_CONF" ""

+        run_process keystone "$(which uwsgi) --procname-prefix keystone --ini $KEYSTONE_PUBLIC_UWSGI_CONF" ""

     fi

     echo "Waiting for keystone to start..."

@@ -463,7 +463,7 @@ function start_neutron_api {

     done

     if [ "$NEUTRON_DEPLOY_MOD_WSGI" == "True" ]; then

-        run_process neutron-api "$NEUTRON_BIN_DIR/uwsgi --procname-prefix neutron-api --ini $NEUTRON_UWSGI_CONF"

+        run_process neutron-api "$(which uwsgi) --procname-prefix neutron-api --ini $NEUTRON_UWSGI_CONF"

         neutron_url=$service_protocol://$NEUTRON_SERVICE_HOST/networking/

         enable_service neutron-rpc-server

         run_process neutron-rpc-server "$NEUTRON_BIN_DIR/neutron-rpc-server $opts"

@@ -477,7 +477,7 @@ function start_neutron_service_and_check {

     # Start the Neutron service

     if [ "$NEUTRON_DEPLOY_MOD_WSGI" == "True" ]; then

         enable_service neutron-api

-        run_process neutron-api "$NEUTRON_BIN_DIR/uwsgi --procname-prefix neutron-api --ini $NEUTRON_UWSGI_CONF"

+        run_process neutron-api "$(which uwsgi) --procname-prefix neutron-api --ini $NEUTRON_UWSGI_CONF"

         neutron_url=$Q_PROTOCOL://$Q_HOST/networking/

         enable_service neutron-rpc-server

         run_process neutron-rpc-server "$NEUTRON_BIN_DIR/neutron-rpc-server $cfg_file_options"

@@ -857,7 +857,7 @@ function start_nova_api {

             start_tls_proxy nova '*' $NOVA_SERVICE_PORT $NOVA_SERVICE_HOST $NOVA_SERVICE_PORT_INT

         fi

     else

-        run_process "n-api" "$NOVA_BIN_DIR/uwsgi --procname-prefix nova-api --ini $NOVA_UWSGI_CONF"

+        run_process "n-api" "$(which uwsgi) --procname-prefix nova-api --ini $NOVA_UWSGI_CONF"

         nova_url=$service_protocol://$SERVICE_HOST/compute/v2.1/

     fi

@@ -948,7 +948,7 @@ function start_nova_rest {

     if [ "$NOVA_USE_MOD_WSGI" == "False" ]; then

         run_process n-api-meta "$NOVA_BIN_DIR/nova-api-metadata --config-file $compute_cell_conf"

     else

-        run_process n-api-meta "$NOVA_BIN_DIR/uwsgi --procname-prefix nova-api-meta --ini $NOVA_METADATA_UWSGI_CONF"

+        run_process n-api-meta "$(which uwsgi) --procname-prefix nova-api-meta --ini $NOVA_METADATA_UWSGI_CONF"

     fi

     export PATH=$old_path

@@ -144,7 +144,7 @@ function install_placement {

 # start_placement_api() - Start the API processes ahead of other things

 function start_placement_api {

     if [[ "$WSGI_MODE" == "uwsgi" ]]; then

-        run_process "placement-api" "$PLACEMENT_BIN_DIR/uwsgi --procname-prefix placement --ini $PLACEMENT_UWSGI_CONF"

+        run_process "placement-api" "$(which uwsgi) --procname-prefix placement --ini $PLACEMENT_UWSGI_CONF"

     else

         enable_apache_site placement-api

         restart_apache_server