openstack
/
cookbook-openstack-block-storage
Code Issues Proposed changes

Merge "Add attributes for cinder quotas"

This commit is contained in:
Jenkins 2014-10-09 21:23:28 +00:00 committed by Gerrit Code Review
parent 85007635ab 5d0aac6578
commit 8c42b6bd4c
4 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -10,6 +10,8 @@ This file is used to list changes made in each version of the openstack-block-st
* Update deprecated keystoneclient.middleware.auth_token in api-paste.ini
* 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

3
attributes/default.rb
View File

@ -101,6 +101,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

1
spec/cinder_common_spec.rb
View File

@ -193,6 +193,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"

11
templates/default/cinder.conf.erb
View File

@ -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 ########