diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index a2c6be205e..c7ba2cd69e 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -559,11 +559,13 @@ elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
     echo_summary "Creating Manila entities for auth service"
     create_manila_accounts
 
-    echo_summary "Creating Manila service flavor"
-    create_manila_service_flavor
+    if is_service_enabled nova; then
+        echo_summary "Creating Manila service flavor"
+        create_manila_service_flavor
 
-    echo_summary "Creating Manila service security group"
-    create_manila_service_secgroup
+        echo_summary "Creating Manila service security group"
+        create_manila_service_secgroup
+    fi
 
     # Skip image downloads when disabled.
     # This way vendor Manila driver CI tests can skip
@@ -575,12 +577,14 @@ elif [[ "$1" == "stack" && "$2" == "extra" ]]; then
         echo_summary "Skipping download of Manila service image"
     fi
 
-    echo_summary "Creating Manila service keypair"
-    create_manila_service_keypair
+    if is_service_enabled nova; then
+        echo_summary "Creating Manila service keypair"
+        create_manila_service_keypair
 
-    echo_summary "Creating Manila service VMs for generic driver \
-        backends for which handlng of share servers is disabled."
-    create_service_share_servers
+        echo_summary "Creating Manila service VMs for generic driver \
+            backends for which handlng of share servers is disabled."
+        create_service_share_servers
+    fi
 
     echo_summary "Configure Samba server"
     configure_samba