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

Merge "Add attribute for osapi_volume_workers"

Browse Source
This commit is contained in:
Jenkins
2014-09-23 02:29:18 +00:00
committed by Gerrit Code Review
parent 3b3c18ff81 5ef8617161
commit 639961657d
4 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -9,6 +9,7 @@ This file is used to list changes made in each version of the openstack-block-st
* Sync conf files with Juno * Sync conf files with Juno
* Upgrading berkshelf from 2.0.18 to 3.1.5 * Upgrading berkshelf from 2.0.18 to 3.1.5
* Move keystone keys into cinder.conf * Move keystone keys into cinder.conf
* Add attribute for osapi_volume_workers
## 9.4.1 ## 9.4.1
* Add support for LVMISCSIDriver driver using block devices with LVM * Add support for LVMISCSIDriver driver using block devices with LVM

5
attributes/default.rb
View File

@@ -49,6 +49,11 @@ default['openstack']['block-storage']['control_exchange'] = 'cinder'
default['openstack']['block-storage']['region'] = node['openstack']['region'] default['openstack']['block-storage']['region'] = node['openstack']['region']
default['openstack']['block-storage']['scheduler_role'] = 'os-block-storage-scheduler' default['openstack']['block-storage']['scheduler_role'] = 'os-block-storage-scheduler'
# Number of workers for OpenStack Volume API service. The
# default is equal to the number of CPUs available. (integer
# value)
default['openstack']['block-storage']['osapi_volume_workers'] = [8, node['cpu']['total'].to_i].min
# Template strings to be used to generate resource names # Template strings to be used to generate resource names
default['openstack']['block-storage']['volume_name_template'] = 'volume-%s' default['openstack']['block-storage']['volume_name_template'] = 'volume-%s'
default['openstack']['block-storage']['snapshot_name_template'] = 'snapshot-%s' default['openstack']['block-storage']['snapshot_name_template'] = 'snapshot-%s'

2
spec/cinder_common_spec.rb
View File

@@ -136,7 +136,7 @@ describe 'openstack-block-storage::cinder-common' do
context 'commonly named attributes' do context 'commonly named attributes' do
%w(debug verbose lock_path notification_driver %w(debug verbose lock_path notification_driver
storage_availability_zone quota_volumes quota_gigabytes quota_driver storage_availability_zone quota_volumes quota_gigabytes quota_driver
volume_name_template snapshot_name_template volume_name_template snapshot_name_template osapi_volume_workers
control_exchange max_gigabytes).each do |attr_key| control_exchange max_gigabytes).each do |attr_key|
it "has a #{attr_key} attribute" do it "has a #{attr_key} attribute" do
node.set['openstack']['block-storage'][attr_key] = "#{attr_key}_value" node.set['openstack']['block-storage'][attr_key] = "#{attr_key}_value"

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

@@ -221,6 +221,11 @@ osapi_volume_listen=<%= @volume_api_bind_address %>
#### (IntOpt) port for os volume api to listen #### (IntOpt) port for os volume api to listen
osapi_volume_listen_port=<%= @volume_api_bind_port %> osapi_volume_listen_port=<%= @volume_api_bind_port %>
# Number of workers for OpenStack Volume API service. The
# default is equal to the number of CPUs available. (integer
# value)
osapi_volume_workers=<%= node["openstack"]["block-storage"]["osapi_volume_workers"] %>
######## defined in cinder.test ######## ######## defined in cinder.test ########
# sqlite_clean_db=clean.sqlite # sqlite_clean_db=clean.sqlite