diff --git a/devstack/settings b/devstack/settings
index 751ff5180..d1231be24 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -18,4 +18,6 @@
 # Enable Zun services
 enable_service zun-api
 enable_service zun-compute
-enable_service zun-etcd
+if [[ ${ZUN_DB_TYPE} == "etcd" ]]; then
+    enable_service zun-etcd
+fi