diff --git a/manifests/quota.pp b/manifests/quota.pp
index 84e7fc4f..418b8a09 100644
--- a/manifests/quota.pp
+++ b/manifests/quota.pp
@@ -29,6 +29,10 @@
 #   (Optional) Default driver to use for quota checks.
 #   Defaults to $::os_service_default.
 #
+# [*per_volume_size_limit*]
+#   (Optional) Max size allowed per volume, in gigabytes
+#   Defaults to $::os_service_default.
+#
 class cinder::quota (
   $quota_volumes          = $::os_service_default,
   $quota_snapshots        = $::os_service_default,
@@ -36,6 +40,7 @@ class cinder::quota (
   $quota_backups          = $::os_service_default,
   $quota_backup_gigabytes = $::os_service_default,
   $quota_driver           = $::os_service_default,
+  $per_volume_size_limit  = $::os_service_default,
 ) {
 
   include cinder::deps
@@ -47,5 +52,6 @@ class cinder::quota (
     'DEFAULT/quota_backups':          value => $quota_backups;
     'DEFAULT/quota_backup_gigabytes': value => $quota_backup_gigabytes;
     'DEFAULT/quota_driver':           value => $quota_driver;
+    'DEFAULT/per_volume_size_limit':  value => $per_volume_size_limit;
   }
 }
diff --git a/releasenotes/notes/quota-per_volume_size_limit-8d40ab1b86af0f71.yaml b/releasenotes/notes/quota-per_volume_size_limit-8d40ab1b86af0f71.yaml
new file mode 100644
index 00000000..d4f48089
--- /dev/null
+++ b/releasenotes/notes/quota-per_volume_size_limit-8d40ab1b86af0f71.yaml
@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    The ``cinder::quota`` class now supports the ``per_volume_size_limit``
+    parameter, which defines max size allowed per volume.
diff --git a/spec/classes/cinder_quota_spec.rb b/spec/classes/cinder_quota_spec.rb
index eb84bc18..e8d87d57 100644
--- a/spec/classes/cinder_quota_spec.rb
+++ b/spec/classes/cinder_quota_spec.rb
@@ -15,6 +15,7 @@ describe 'cinder::quota' do
         is_expected.to contain_cinder_config('DEFAULT/quota_backups').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_cinder_config('DEFAULT/quota_backup_gigabytes').with_value('<SERVICE DEFAULT>')
         is_expected.to contain_cinder_config('DEFAULT/quota_driver').with_value('<SERVICE DEFAULT>')
+        is_expected.to contain_cinder_config('DEFAULT/per_volume_size_limit').with_value('<SERVICE DEFAULT>')
       end
     end
 
@@ -26,7 +27,8 @@ describe 'cinder::quota' do
           :quota_gigabytes        => 100000,
           :quota_backups          => 100,
           :quota_backup_gigabytes => 10000,
-          :quota_driver           => 'cinder.quota.DbQuotaDriver'
+          :quota_driver           => 'cinder.quota.DbQuotaDriver',
+          :per_volume_size_limit  => 50
         }
       end
 
@@ -37,6 +39,7 @@ describe 'cinder::quota' do
         is_expected.to contain_cinder_config('DEFAULT/quota_backups').with_value(100)
         is_expected.to contain_cinder_config('DEFAULT/quota_backup_gigabytes').with_value(10000)
         is_expected.to contain_cinder_config('DEFAULT/quota_driver').with_value('cinder.quota.DbQuotaDriver')
+        is_expected.to contain_cinder_config('DEFAULT/per_volume_size_limit').with_value(50)
       end
     end
   end