Initial Liberty Changes

Metadata changes
- Updated maintainer email
- Updated the version

rubocop updates
remove db2 refs

Change-Id: I4be2304091443ee173ebb4605e24b54c699b929a
This commit is contained in:
Mark Vanderwiel 2015-08-28 14:43:14 -05:00
parent ea2fbba04a
commit b2b093cc3b
6 changed files with 10 additions and 43 deletions

View File

@ -1,11 +1,11 @@
# encoding: UTF-8
name 'openstack-block-storage'
maintainer 'openstack-chef'
maintainer_email 'opscode-chef-openstack@googlegroups.com'
maintainer_email 'openstack-dev@lists.openstack.org'
license 'Apache 2.0'
description 'The OpenStack Advanced Volume Management service Cinder.'
long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
version '11.1.0'
version '12.0.0'
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'
@ -20,9 +20,9 @@ recipe 'openstack-block-storage::backup', 'Installs the cinder-backup service'
end
depends 'apt', '~> 2.6.1'
depends 'openstack-common', '>= 11.5.0'
depends 'openstack-identity', '>= 11.0.0'
depends 'openstack-image', '>= 11.0.0'
depends 'openstack-common', '>= 12.0.0'
depends 'openstack-identity', '>= 12.0.0'
depends 'openstack-image', '>= 12.0.0'
depends 'selinux', '~> 0.9.0'
depends 'python', '~> 1.4.6'
depends 'ceph', '~> 0.8.0'

View File

@ -20,14 +20,6 @@ describe 'openstack-block-storage::api' do
expect(chef_run).to upgrade_package 'MySQL-python'
end
it 'upgrades db2 python packages if explicitly told' do
node.set['openstack']['db']['block-storage']['service_type'] = 'db2'
['python-ibm-db', 'python-ibm-db-sa'].each do |pkg|
expect(chef_run).to upgrade_package pkg
end
end
it 'upgrades postgresql python packages if explicitly told' do
node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'

View File

@ -29,14 +29,6 @@ describe 'openstack-block-storage::backup' do
expect(chef_run).to upgrade_package 'MySQL-python'
end
it 'upgrades db2 python packages if explicitly told' do
node.set['openstack']['db']['block-storage']['service_type'] = 'db2'
['python-ibm-db', 'python-ibm-db-sa'].each do |pkg|
expect(chef_run).to upgrade_package pkg
end
end
it 'upgrades postgresql python packages if explicitly told' do
node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'

View File

@ -32,14 +32,6 @@ describe 'openstack-block-storage::scheduler' do
expect(chef_run).to upgrade_package 'MySQL-python'
end
it 'upgrades db2 python packages if explicitly told' do
node.set['openstack']['db']['block-storage']['service_type'] = 'db2'
['python-ibm-db', 'python-ibm-db-sa'].each do |pkg|
expect(chef_run).to upgrade_package pkg
end
end
it 'upgrades postgresql python packages if explicitly told' do
node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'

View File

@ -16,14 +16,6 @@ describe 'openstack-block-storage::volume' do
expect(chef_run).to upgrade_package('MySQL-python')
end
it 'upgrades db2 python packages if explicitly told' do
node.set['openstack']['db']['block-storage']['service_type'] = 'db2'
['python-ibm-db', 'python-ibm-db-sa'].each do |pkg|
expect(chef_run).to upgrade_package(pkg)
end
end
it 'upgrades postgresql python packages if explicitly told' do
node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'

View File

@ -68,7 +68,7 @@ describe 'openstack-block-storage::volume' do
owner: 'cinder',
group: 'cinder',
mode: '0600'
)
)
end
it 'sets the ibmnas access_ip attribute' do
@ -328,18 +328,18 @@ describe 'openstack-block-storage::volume' do
%w(StorageType EcomServerPort EcomUserName).each do |attr|
it "has an emc #{attr} setting" do
node.set['openstack']['block-storage']['emc'][attr] = "emc_#{attr}_value"
expect(chef_run).to render_file(file.name).with_content(/^<#{attr}>emc_#{attr}_value<\/#{attr}>$/)
expect(chef_run).to render_file(file.name).with_content(%r{^<#{attr}>emc_#{attr}_value</#{attr}>$})
end
end
it 'has a EcomServerIP' do
node.set['openstack']['block-storage']['emc']['EcomServerIP'] = 'emc_EcomServerIP_value'
expect(chef_run).to render_file(file.name).with_content(/^<EcomServerIp>emc_EcomServerIP_value<\/EcomServerIp>$/)
expect(chef_run).to render_file(file.name).with_content(%r{^<EcomServerIp>emc_EcomServerIP_value</EcomServerIp>$})
end
it 'has EcomPassword' do
node.set['openstack']['block-storage']['emc']['EcomUserName'] = 'emc_username'
expect(chef_run).to render_file(file.name).with_content(/^<EcomPassword>emc_test_pass<\/EcomPassword>$/)
expect(chef_run).to render_file(file.name).with_content(%r{^<EcomPassword>emc_test_pass</EcomPassword>$})
end
it 'does not have MaskingView when not specified' do
@ -348,8 +348,7 @@ describe 'openstack-block-storage::volume' do
it 'has MaskingView when specified' do
node.set['openstack']['block-storage']['emc']['MaskingView'] = 'testMaskingView'
expect(chef_run).to render_file(file.name).with_content(/^<MaskingView>testMaskingView<\/MaskingView>$/)
expect(chef_run).to render_file(file.name).with_content(%r{^<MaskingView>testMaskingView</MaskingView>$})
end
end
end