diff --git a/CHANGELOG.md b/CHANGELOG.md
index d897d6e..0c677ba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,8 @@ This file is used to list changes made in each version of the openstack-block-st
 # Update cinder.conf mode from 0644 to 0640
 * Add attribute for ibmnas_platform_type
 
+* Add attributes for quota_snapshots, no_snapshot_gb_quota and use_default_quota_class
+
 ## 10.0.0
 * Upgrading to Juno
 * Sync conf files with Juno
diff --git a/attributes/default.rb b/attributes/default.rb
index bc58b6d..c98452e 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -83,6 +83,9 @@ default['openstack']['block-storage']['storage_availability_zone'] = 'nova'
 default['openstack']['block-storage']['quota_volumes'] = '10'
 default['openstack']['block-storage']['quota_gigabytes'] = '1000'
 default['openstack']['block-storage']['quota_driver'] = 'cinder.quota.DbQuotaDriver'
+default['openstack']['block-storage']['quota_snapshots'] = 10
+default['openstack']['block-storage']['no_snapshot_gb_quota'] = false
+default['openstack']['block-storage']['use_default_quota_class'] = true
 
 # Common rpc definitions
 default['openstack']['block-storage']['rpc_thread_pool_size'] = 64
diff --git a/spec/cinder_common_spec.rb b/spec/cinder_common_spec.rb
index a4f6d6f..5ccc0c8 100644
--- a/spec/cinder_common_spec.rb
+++ b/spec/cinder_common_spec.rb
@@ -137,6 +137,7 @@ describe 'openstack-block-storage::cinder-common' do
           %w(debug verbose lock_path notification_driver
              storage_availability_zone quota_volumes quota_gigabytes quota_driver
              volume_name_template snapshot_name_template osapi_volume_workers
+             use_default_quota_class quota_snapshots no_snapshot_gb_quota
              control_exchange max_gigabytes).each do |attr_key|
             it "has a #{attr_key} attribute" do
               node.set['openstack']['block-storage'][attr_key] = "#{attr_key}_value"
diff --git a/templates/default/cinder.conf.erb b/templates/default/cinder.conf.erb
index 1748432..d4c0987 100644
--- a/templates/default/cinder.conf.erb
+++ b/templates/default/cinder.conf.erb
@@ -201,6 +201,17 @@ quota_gigabytes=<%= node["openstack"]["block-storage"]["quota_gigabytes"] %>
 quota_driver=<%= node["openstack"]["block-storage"]["quota_driver"] %>
 #### (StrOpt) default driver to use for quota checks
 
+# Number of volume snapshots allowed per project (integer
+# value)
+quota_snapshots=<%= node["openstack"]["block-storage"]["quota_snapshots"] %>
+
+# Whether snapshots count against GigaByte quota (boolean
+# value)
+no_snapshot_gb_quota=<%= node["openstack"]["block-storage"]["no_snapshot_gb_quota"] %>
+
+# Enables or disables use of default quota class with default
+# quota. (boolean value)
+use_default_quota_class=<%= node["openstack"]["block-storage"]["use_default_quota_class"] %>
 
 ######## defined in cinder.service ########