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

Merge "Fix default value for storwize_svc_vol_rsize"

This commit is contained in:
Jenkins 2014-05-29 18:55:34 +00:00 committed by Gerrit Code Review
parent 2d4b748704 c16faa418a
commit 285a8467ab
4 changed files with 40 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -1,6 +1,9 @@
openstack-block-storage Cookbook CHANGELOG
==============================
This file is used to list changes made in each version of the openstack-block-storage cookbook.
## 9.2.3
* Fix for storwize_svc_vol_rsize default
## 9.2.2
### Bug
* Add support for miscellaneous options (like in Compute)

2
attributes/default.rb
View File

@ -130,7 +130,7 @@ default['openstack']['block-storage']['storwize']['san_ip'] = node['openstack'][
default['openstack']['block-storage']['storwize']['san_login'] = node['openstack']['block-storage']['san']['san_login']
default['openstack']['block-storage']['storwize']['san_private_key'] = node['openstack']['block-storage']['san']['san_private_key']
default['openstack']['block-storage']['storwize']['storwize_svc_volpool_name'] = 'volpool'
default['openstack']['block-storage']['storwize']['storwize_svc_vol_rsize'] = '2%'
default['openstack']['block-storage']['storwize']['storwize_svc_vol_rsize'] = 2
default['openstack']['block-storage']['storwize']['storwize_svc_vol_warning'] = 0
default['openstack']['block-storage']['storwize']['storwize_svc_vol_autoexpand'] = true
default['openstack']['block-storage']['storwize']['storwize_svc_vol_grainsize'] = 256

2
metadata.rb
View File

@ -5,7 +5,7 @@ maintainer_email 'cookbooks@lists.tfoundry.com'
license 'Apache 2.0'
description 'The OpenStack Advanced Volume Management service Cinder.'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '9.2.2'
version '9.2.3'
recipe 'openstack-block-storage::api', 'Installs the cinder-api, sets up the cinder database, and cinder service/user/endpoints in keystone'
recipe 'openstack-block-storage::client', 'Install packages required for cinder client'

41
spec/cinder_common_spec.rb
View File

@ -386,12 +386,41 @@ describe 'openstack-block-storage::cinder-common' do
node.set['openstack']['block-storage']['volume']['driver'] = 'cinder.volume.drivers.ibm.storwize_svc.StorwizeSVCDriver'
end
%w(san_ip san_login san_private_key storwize_svc_volpool_name
storwize_svc_vol_rsize storwize_svc_vol_warning storwize_svc_vol_autoexpand
storwize_svc_vol_grainsize storwize_svc_vol_compression storwize_svc_vol_easytier
storwize_svc_vol_iogrp storwize_svc_flashcopy_timeout storwize_svc_connection_protocol
storwize_svc_multihostmap_enabled).each do |attr|
it "has a san_#{attr} attribute" do
it 'has a default attribute' do
%w(san_ip=127.0.0.1
san_login=admin
san_private_key=/v7000_rsa
storwize_svc_volpool_name=volpool
storwize_svc_vol_rsize=2
storwize_svc_vol_warning=0
storwize_svc_vol_autoexpand=true
storwize_svc_vol_grainsize=256
storwize_svc_vol_compression=false
storwize_svc_vol_easytier=true
storwize_svc_vol_iogrp=0
storwize_svc_flashcopy_timeout=120
storwize_svc_connection_protocol=iSCSI
storwize_svc_iscsi_chap_enabled=true
storwize_svc_multihostmap_enabled=true).each do |attr|
expect(chef_run).to render_file(file.name).with_content(/^#{attr}$/)
end
end
it 'has a overridden attribute' do
%w(san_ip
san_login
san_private_key
storwize_svc_volpool_name
storwize_svc_vol_rsize
storwize_svc_vol_warning
storwize_svc_vol_autoexpand
storwize_svc_vol_grainsize
storwize_svc_vol_compression
storwize_svc_vol_easytier
storwize_svc_vol_iogrp
storwize_svc_flashcopy_timeout
storwize_svc_connection_protocol
storwize_svc_multihostmap_enabled).each do |attr|
node.set['openstack']['block-storage']['storwize'][attr] = "storwize_#{attr}_value"
expect(chef_run).to render_file(file.name).with_content(/^#{attr}=storwize_#{attr}_value$/)
end