Remove conductor from devstack setting

Now that we don't have conductor in Zun, let's remove from devstack
setting.

Change-Id: Ica5e5e55f81741b8ffb0c1f127db9e8b64afdee0

devstack/lib/zun

@@ -246,12 +246,6 @@ function start_zun_api {
     fi
 }
 
-# start_zun_conductor() - Start Zun conductor
-function start_zun_conductor {
-    echo "start zun conductor "
-    run_process zun-conductor "$ZUN_BIN_DIR/zun-conductor"
-}
-
 # start_zun_compute() - Start Zun compute agent
 function start_zun_compute {
     echo "start zun compute"
@@ -263,13 +257,12 @@ function start_zun {
 
     # ``run_process`` checks ``is_service_enabled``, it is not needed here
     start_zun_api
-    start_zun_conductor
     start_zun_compute
 }
 
 # stop_zun() - Stop running processes (non-screen)
 function stop_zun {
-    for serv in zun-api zun-conductor zun-compute; do
+    for serv in zun-api zun-compute; do
         stop_process $serv
     done
 }

devstack/plugin.sh

@@ -8,7 +8,7 @@ echo_summary "zun's plugin.sh was called..."
 source $DEST/higgins/devstack/lib/zun
 (set -o posix; set)
 
-if is_service_enabled zun-api zun-conductor; then
+if is_service_enabled zun-api zun-compute; then
     if [[ "$1" == "stack" && "$2" == "install" ]]; then
         echo_summary "Installing zun"
         install_zun
@@ -30,7 +30,7 @@ if is_service_enabled zun-api zun-conductor; then
         # Initialize zun
         init_zun
 
-        # Start the zun API and zun conductor
+        # Start the zun API and zun compute
         echo_summary "Starting zun"
         start_zun
 

devstack/settings

@@ -17,5 +17,4 @@
 
 # Enable Zun services
 enable_service zun-api
-enable_service zun-conductor
 enable_service zun-compute