diff --git a/attributes/default.rb b/attributes/default.rb
index ce3e18a..b25fd41 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -59,6 +59,15 @@ default["cinder"]["user"] = "cinder"
 # Should equal total backend storage, default is 10TB
 default["cinder"]["max_gigabytes"] = "10000"
 
+# Storage availability zone
+# Default is nova
+default["cinder"]["storage_availability_zone"] = "nova"
+
+# Quota definitions
+default["cinder"]["quota_volumes"] = "10"
+default["cinder"]["quota_gigabytes"] = "1000"
+default["cinder"]["quota_driver"] = "cinder.quota.DbQuotaDriver"
+
 # This user's password is stored in an encrypted databag
 # and accessed with openstack-common cookbook library's
 # user_password routine.  You are expected to create
diff --git a/templates/default/cinder.conf.erb b/templates/default/cinder.conf.erb
index 52c7f6f..7ec5cd6 100644
--- a/templates/default/cinder.conf.erb
+++ b/templates/default/cinder.conf.erb
@@ -184,10 +184,10 @@ auth_strategy=keystone
 
 ######## defined in cinder.quota ########
 
-# quota_volumes=10
+quota_volumes=<%= node["cinder"]["quota_volumes"] %>
 #### (IntOpt) number of volumes allowed per project
 
-# quota_gigabytes=1000
+quota_gigabytes=<%= node["cinder"]["quota_gigabytes"] %>
 #### (IntOpt) number of volume gigabytes allowed per project
 
 # reservation_expire=86400
@@ -199,7 +199,7 @@ auth_strategy=keystone
 # max_age=0
 #### (IntOpt) number of seconds between subsequent usage refreshes
 
-# quota_driver=cinder.quota.DbQuotaDriver
+quota_driver=<%= node["cinder"]["quota_driver"] %>
 #### (StrOpt) default driver to use for quota checks