diff --git a/devstack/lib/zun b/devstack/lib/zun
index bf5cbfe9c..9b9cc16e8 100644
--- a/devstack/lib/zun
+++ b/devstack/lib/zun
@@ -247,18 +247,30 @@ 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"
+    run_process zun-compute "$ZUN_BIN_DIR/zun-compute"
+}
 
 # start_zun() - Start running processes, including screen
 function start_zun {
 
     # ``run_process`` checks ``is_service_enabled``, it is not needed here
     start_zun_api
-    run_process zun-conductor "$ZUN_BIN_DIR/zun-conductor"
+    start_zun_conductor
+    start_zun_compute
 }
 
 # stop_zun() - Stop running processes (non-screen)
 function stop_zun {
-    for serv in zun-api zun-conductor; do
+    for serv in zun-api zun-conductor zun-compute; do
         stop_process $serv
     done
 }
diff --git a/devstack/settings b/devstack/settings
index 7c81fb1f3..def892b08 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -18,3 +18,4 @@
 # Enable Zun services
 enable_service zun-api
 enable_service zun-conductor
+enable_service zun-compute
diff --git a/setup.cfg b/setup.cfg
index 288fcd95b..142da4d10 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -47,6 +47,7 @@ output_file = zun/locale/zun.pot
 [entry_points]
 console_scripts =
     zun-api = zun.cmd.api:main
+    zun-compute = zun.cmd.compute:main
     zun-conductor = zun.cmd.conductor:main
     zun-db-manage = zun.cmd.db_manage:main