@@ -434,12 +434,13 @@ function start_nova() {

     screen_it n-novnc "cd $NOVNC_DIR && ./utils/nova-novncproxy --config-file $NOVA_CONF --web ."

     screen_it n-xvnc "cd $NOVA_DIR && ./bin/nova-xvpvncproxy --config-file $NOVA_CONF"

     screen_it n-cauth "cd $NOVA_DIR && ./bin/nova-consoleauth"

+    screen_it n-cond "cd $NOVA_DIR && ./bin/nova-conductor"

 }

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

 function stop_nova() {

     # Kill the nova screen windows

-    for serv in n-api n-cpu n-crt n-net n-sch n-novnc n-xvnc n-cauth; do

+    for serv in n-api n-cpu n-crt n-net n-sch n-novnc n-xvnc n-cauth n-cond; do

         screen -S $SCREEN_NAME -p $serv -X kill

     done

 }

@@ -14,7 +14,7 @@ DATABASE_TYPE=mysql

 # ``disable_service`` functions in ``localrc``.

 # For example, to enable Swift add this to ``localrc``:

 # enable_service swift

-ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,cinder,c-sch,c-api,c-vol,n-sch,n-novnc,n-xvnc,n-cauth,horizon,rabbit,$DATABASE_TYPE

+ENABLED_SERVICES=g-api,g-reg,key,n-api,n-crt,n-obj,n-cpu,n-net,n-cond,cinder,c-sch,c-api,c-vol,n-sch,n-novnc,n-xvnc,n-cauth,horizon,rabbit,$DATABASE_TYPE

 # Set the default Nova APIs to enable

 NOVA_ENABLED_APIS=ec2,osapi_compute,metadata