@@ -471,7 +471,7 @@ function _configure_tgt_for_config_d {

     fi

 }

-# start_cinder() - Start running processes, including screen

+# start_cinder() - Start running processes

 function start_cinder {

     local service_port=$CINDER_SERVICE_PORT

     local service_protocol=$CINDER_SERVICE_PROTOCOL

@@ -531,12 +531,9 @@ function start_cinder {

 # stop_cinder() - Stop running processes

 function stop_cinder {

     stop_process c-api

-

-    # Kill the cinder screen windows

-    local serv

-    for serv in c-bak c-sch c-vol; do

-        stop_process $serv

-    done

+    stop_process c-bak

+    stop_process c-sch

+    stop_process c-vol

 }

 # create_volume_types() - Create Cinder's configured volume types

@@ -16,7 +16,7 @@

 _XTRACE_DSTAT=$(set +o | grep xtrace)

 set +o xtrace

-# start_dstat() - Start running processes, including screen

+# start_dstat() - Start running processes

 function start_dstat {

     # A better kind of sysstat, with the top process per time slice

     run_process dstat "$TOP_DIR/tools/dstat.sh $LOGDIR"

@@ -333,7 +333,7 @@ function install_glance {

     setup_develop $GLANCE_DIR

 }

-# start_glance() - Start running processes, including screen

+# start_glance() - Start running processes

 function start_glance {

     local service_protocol=$GLANCE_SERVICE_PROTOCOL

     if is_service_enabled tls-proxy; then

@@ -358,7 +358,6 @@ function start_glance {

 # stop_glance() - Stop running processes

 function stop_glance {

-    # Kill the Glance screen windows

     stop_process g-api

     stop_process g-reg

 }

@@ -181,13 +181,12 @@ function install_horizon {

     git_clone $HORIZON_REPO $HORIZON_DIR $HORIZON_BRANCH

 }

-# start_horizon() - Start running processes, including screen

+# start_horizon() - Start running processes

 function start_horizon {

     restart_apache_server

-    tail_log horizon /var/log/$APACHE_NAME/horizon_error.log

 }

-# stop_horizon() - Stop running processes (non-screen)

+# stop_horizon() - Stop running processes

 function stop_horizon {

     stop_apache_server

 }

@@ -536,7 +536,7 @@ function install_keystone {

     fi

 }

-# start_keystone() - Start running processes, including screen

+# start_keystone() - Start running processes

 function start_keystone {

     # Get right service port for testing

     local service_port=$KEYSTONE_SERVICE_PORT

@@ -549,8 +549,6 @@ function start_keystone {

     if [ "$KEYSTONE_DEPLOY" == "mod_wsgi" ]; then

         enable_apache_site keystone

         restart_apache_server

-        tail_log key /var/log/$APACHE_NAME/keystone.log

-        tail_log key-access /var/log/$APACHE_NAME/keystone_access.log

     else # uwsgi

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

     fi

@@ -585,8 +583,6 @@ function stop_keystone {

     else

         stop_process keystone

     fi

-    # Kill the Keystone screen window

-    stop_process key

 }

 # bootstrap_keystone() - Initialize user, role and project

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

     fi

 }

-# start_neutron() - Start running processes, including screen

+# start_neutron() - Start running processes

 function start_neutron_new {

     # Start up the neutron agents if enabled

     # TODO(sc68cal) Make this pluggable so different DevStack plugins for different Neutron plugins

@@ -447,7 +447,7 @@ function start_neutron_new {

     fi

 }

-# stop_neutron() - Stop running processes (non-screen)

+# stop_neutron() - Stop running processes

 function stop_neutron_new {

     for serv in neutron-api neutron-agent neutron-l3; do

         stop_process $serv

@@ -455,7 +455,7 @@ function configure_neutron_after_post_config {

     fi

 }

-# Start running processes, including screen

+# Start running processes

 function start_neutron_service_and_check {

     local service_port=$Q_PORT

     local service_protocol=$Q_PROTOCOL

@@ -524,7 +524,7 @@ function stop_mutnauq_l2_agent {

     stop_process q-agt

 }

-# stop_mutnauq_other() - Stop running processes (non-screen)

+# stop_mutnauq_other() - Stop running processes

 function stop_mutnauq_other {

     if is_service_enabled q-dhcp; then

         stop_process q-dhcp

@@ -883,7 +883,7 @@ function start_nova_compute {

     export PATH=$old_path

 }

-# start_nova() - Start running processes, including screen

+# start_nova() - Start running processes

 function start_nova_rest {

     # Hack to set the path for rootwrap

     local old_path=$PATH

@@ -1022,7 +1022,7 @@ function stop_nova_conductor {

     done

 }

-# stop_nova() - Stop running processes (non-screen)

+# stop_nova() - Stop running processes

 function stop_nova {

     stop_nova_rest

     stop_nova_conductor

@@ -7,7 +7,7 @@

 #

 # - ``functions`` file

 # - ``apache`` file

-# - ``DEST``, ``SCREEN_NAME``, `SWIFT_HASH` must be defined

+# - ``DEST``, `SWIFT_HASH` must be defined

 # - ``STACK_USER`` must be defined

 # - ``SWIFT_DATA_DIR`` or ``DATA_DIR`` must be defined

 # - ``lib/keystone`` file

@@ -781,7 +781,7 @@ function install_ceilometermiddleware {

     fi

 }

-# start_swift() - Start running processes, including screen

+# start_swift() - Start running processes

 function start_swift {

     # (re)start memcached to make sure we have a clean memcache.

     restart_service memcached

@@ -800,13 +800,6 @@ function start_swift {

         restart_apache_server

         # The rest of the services should be started in backgroud

         swift-init --run-dir=${SWIFT_DATA_DIR}/run rest start

-        # Be we still want the logs of Swift Proxy in our screen session

-        tail_log s-proxy /var/log/$APACHE_NAME/proxy-server

-        if [[ ${SWIFT_REPLICAS} == 1 ]]; then

-            for type in object container account; do

-                tail_log s-${type} /var/log/$APACHE_NAME/${type}-server-1

-            done

-        fi

         return 0

     fi

@@ -860,7 +853,7 @@ function start_swift {

     fi

 }

-# stop_swift() - Stop running processes (non-screen)

+# stop_swift() - Stop running processes

 function stop_swift {

     local type

@@ -81,7 +81,7 @@ function install_XXXX {

     :

 }

-# start_XXXX() - Start running processes, including screen

+# start_XXXX() - Start running processes

 function start_XXXX {

     # The quoted command must be a single command and not include an

     # shell metacharacters, redirections or shell builtins.

@@ -89,7 +89,7 @@ function start_XXXX {

     :

 }

-# stop_XXXX() - Stop running processes (non-screen)

+# stop_XXXX() - Stop running processes

 function stop_XXXX {

     # for serv in serv-a serv-b; do

     #     stop_process $serv