diff --git a/devstack/files/debs/manila b/devstack/files/debs/manila
new file mode 100644
index 0000000000..6f88eb9198
--- /dev/null
+++ b/devstack/files/debs/manila
@@ -0,0 +1 @@
+lvm2
diff --git a/devstack/files/rpms-suse/manila b/devstack/files/rpms-suse/manila
new file mode 100644
index 0000000000..6f88eb9198
--- /dev/null
+++ b/devstack/files/rpms-suse/manila
@@ -0,0 +1 @@
+lvm2
diff --git a/devstack/files/rpms/manila b/devstack/files/rpms/manila
new file mode 100644
index 0000000000..6f88eb9198
--- /dev/null
+++ b/devstack/files/rpms/manila
@@ -0,0 +1 @@
+lvm2
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index aec050b17a..30c142c5ee 100755
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -757,7 +757,7 @@ elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
     fi
 
     # Cinder config update
-    if [[ -n "$CINDER_OVERSUBSCRIPTION_RATIO" ]]; then
+    if is_service_enabled cinder && [[ -n "$CINDER_OVERSUBSCRIPTION_RATIO" ]]; then
         CINDER_CONF=${CINDER_CONF:-/etc/cinder/cinder.conf}
         CINDER_ENABLED_BACKENDS=$(iniget $CINDER_CONF DEFAULT enabled_backends)
         for BN in ${CINDER_ENABLED_BACKENDS//,/ }; do