summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Vanderwiel <vanderwl@us.ibm.com>2015-08-28 14:43:14 -0500
committerMark Vanderwiel <vanderwl@us.ibm.com>2015-08-31 12:05:03 -0500
commitb2b093cc3bde6989f686995eb4a0058e3ed66163 (patch)
treecd48ce05b7bd0cff98c31b725e6b2fb25b0076c7
parentea2fbba04a53cc38201a5db92491dc4d45150aac (diff)
Initial Liberty Changes
Metadata changes - Updated maintainer email - Updated the version rubocop updates remove db2 refs Change-Id: I4be2304091443ee173ebb4605e24b54c699b929a
Notes
Notes (review): Verified+2: Jenkins Workflow+1: JJ Asghar <jj@getchef.com> Code-Review+2: Samuel Cassiba <sam@cassiba.com> Submitted-by: Jenkins Submitted-at: Mon, 31 Aug 2015 23:30:31 +0000 Reviewed-on: https://review.openstack.org/218445 Project: openstack/cookbook-openstack-block-storage Branch: refs/heads/master
-rw-r--r--metadata.rb10
-rw-r--r--spec/api-redhat_spec.rb8
-rw-r--r--spec/backup-redhat_spec.rb8
-rw-r--r--spec/scheduler-redhat_spec.rb8
-rw-r--r--spec/volume-redhat_spec.rb8
-rw-r--r--spec/volume_spec.rb11
6 files changed, 10 insertions, 43 deletions
diff --git a/metadata.rb b/metadata.rb
index d6d7bf2..2a52c7e 100644
--- a/metadata.rb
+++ b/metadata.rb
@@ -1,11 +1,11 @@
1# encoding: UTF-8 1# encoding: UTF-8
2name 'openstack-block-storage' 2name 'openstack-block-storage'
3maintainer 'openstack-chef' 3maintainer 'openstack-chef'
4maintainer_email 'opscode-chef-openstack@googlegroups.com' 4maintainer_email 'openstack-dev@lists.openstack.org'
5license 'Apache 2.0' 5license 'Apache 2.0'
6description 'The OpenStack Advanced Volume Management service Cinder.' 6description 'The OpenStack Advanced Volume Management service Cinder.'
7long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) 7long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
8version '11.1.0' 8version '12.0.0'
9 9
10recipe 'openstack-block-storage::api', 'Installs the cinder-api, sets up the cinder database, and cinder service/user/endpoints in keystone' 10recipe 'openstack-block-storage::api', 'Installs the cinder-api, sets up the cinder database, and cinder service/user/endpoints in keystone'
11recipe 'openstack-block-storage::client', 'Install packages required for cinder client' 11recipe 'openstack-block-storage::client', 'Install packages required for cinder client'
@@ -20,9 +20,9 @@ recipe 'openstack-block-storage::backup', 'Installs the cinder-backup service'
20end 20end
21 21
22depends 'apt', '~> 2.6.1' 22depends 'apt', '~> 2.6.1'
23depends 'openstack-common', '>= 11.5.0' 23depends 'openstack-common', '>= 12.0.0'
24depends 'openstack-identity', '>= 11.0.0' 24depends 'openstack-identity', '>= 12.0.0'
25depends 'openstack-image', '>= 11.0.0' 25depends 'openstack-image', '>= 12.0.0'
26depends 'selinux', '~> 0.9.0' 26depends 'selinux', '~> 0.9.0'
27depends 'python', '~> 1.4.6' 27depends 'python', '~> 1.4.6'
28depends 'ceph', '~> 0.8.0' 28depends 'ceph', '~> 0.8.0'
diff --git a/spec/api-redhat_spec.rb b/spec/api-redhat_spec.rb
index afeefa0..3a18ba7 100644
--- a/spec/api-redhat_spec.rb
+++ b/spec/api-redhat_spec.rb
@@ -20,14 +20,6 @@ describe 'openstack-block-storage::api' do
20 expect(chef_run).to upgrade_package 'MySQL-python' 20 expect(chef_run).to upgrade_package 'MySQL-python'
21 end 21 end
22 22
23 it 'upgrades db2 python packages if explicitly told' do
24 node.set['openstack']['db']['block-storage']['service_type'] = 'db2'
25
26 ['python-ibm-db', 'python-ibm-db-sa'].each do |pkg|
27 expect(chef_run).to upgrade_package pkg
28 end
29 end
30
31 it 'upgrades postgresql python packages if explicitly told' do 23 it 'upgrades postgresql python packages if explicitly told' do
32 node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql' 24 node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
33 25
diff --git a/spec/backup-redhat_spec.rb b/spec/backup-redhat_spec.rb
index de27e26..3e46c41 100644
--- a/spec/backup-redhat_spec.rb
+++ b/spec/backup-redhat_spec.rb
@@ -29,14 +29,6 @@ describe 'openstack-block-storage::backup' do
29 expect(chef_run).to upgrade_package 'MySQL-python' 29 expect(chef_run).to upgrade_package 'MySQL-python'
30 end 30 end
31 31
32 it 'upgrades db2 python packages if explicitly told' do
33 node.set['openstack']['db']['block-storage']['service_type'] = 'db2'
34
35 ['python-ibm-db', 'python-ibm-db-sa'].each do |pkg|
36 expect(chef_run).to upgrade_package pkg
37 end
38 end
39
40 it 'upgrades postgresql python packages if explicitly told' do 32 it 'upgrades postgresql python packages if explicitly told' do
41 node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql' 33 node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
42 34
diff --git a/spec/scheduler-redhat_spec.rb b/spec/scheduler-redhat_spec.rb
index 5d774fb..5c59e4f 100644
--- a/spec/scheduler-redhat_spec.rb
+++ b/spec/scheduler-redhat_spec.rb
@@ -32,14 +32,6 @@ describe 'openstack-block-storage::scheduler' do
32 expect(chef_run).to upgrade_package 'MySQL-python' 32 expect(chef_run).to upgrade_package 'MySQL-python'
33 end 33 end
34 34
35 it 'upgrades db2 python packages if explicitly told' do
36 node.set['openstack']['db']['block-storage']['service_type'] = 'db2'
37
38 ['python-ibm-db', 'python-ibm-db-sa'].each do |pkg|
39 expect(chef_run).to upgrade_package pkg
40 end
41 end
42
43 it 'upgrades postgresql python packages if explicitly told' do 35 it 'upgrades postgresql python packages if explicitly told' do
44 node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql' 36 node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
45 37
diff --git a/spec/volume-redhat_spec.rb b/spec/volume-redhat_spec.rb
index 0e66baa..9f433c3 100644
--- a/spec/volume-redhat_spec.rb
+++ b/spec/volume-redhat_spec.rb
@@ -16,14 +16,6 @@ describe 'openstack-block-storage::volume' do
16 expect(chef_run).to upgrade_package('MySQL-python') 16 expect(chef_run).to upgrade_package('MySQL-python')
17 end 17 end
18 18
19 it 'upgrades db2 python packages if explicitly told' do
20 node.set['openstack']['db']['block-storage']['service_type'] = 'db2'
21
22 ['python-ibm-db', 'python-ibm-db-sa'].each do |pkg|
23 expect(chef_run).to upgrade_package(pkg)
24 end
25 end
26
27 it 'upgrades postgresql python packages if explicitly told' do 19 it 'upgrades postgresql python packages if explicitly told' do
28 node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql' 20 node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
29 21
diff --git a/spec/volume_spec.rb b/spec/volume_spec.rb
index 757fd74..7cf8833 100644
--- a/spec/volume_spec.rb
+++ b/spec/volume_spec.rb
@@ -68,7 +68,7 @@ describe 'openstack-block-storage::volume' do
68 owner: 'cinder', 68 owner: 'cinder',
69 group: 'cinder', 69 group: 'cinder',
70 mode: '0600' 70 mode: '0600'
71 ) 71 )
72 end 72 end
73 73
74 it 'sets the ibmnas access_ip attribute' do 74 it 'sets the ibmnas access_ip attribute' do
@@ -328,18 +328,18 @@ describe 'openstack-block-storage::volume' do
328 %w(StorageType EcomServerPort EcomUserName).each do |attr| 328 %w(StorageType EcomServerPort EcomUserName).each do |attr|
329 it "has an emc #{attr} setting" do 329 it "has an emc #{attr} setting" do
330 node.set['openstack']['block-storage']['emc'][attr] = "emc_#{attr}_value" 330 node.set['openstack']['block-storage']['emc'][attr] = "emc_#{attr}_value"
331 expect(chef_run).to render_file(file.name).with_content(/^<#{attr}>emc_#{attr}_value<\/#{attr}>$/) 331 expect(chef_run).to render_file(file.name).with_content(%r{^<#{attr}>emc_#{attr}_value</#{attr}>$})
332 end 332 end
333 end 333 end
334 334
335 it 'has a EcomServerIP' do 335 it 'has a EcomServerIP' do
336 node.set['openstack']['block-storage']['emc']['EcomServerIP'] = 'emc_EcomServerIP_value' 336 node.set['openstack']['block-storage']['emc']['EcomServerIP'] = 'emc_EcomServerIP_value'
337 expect(chef_run).to render_file(file.name).with_content(/^<EcomServerIp>emc_EcomServerIP_value<\/EcomServerIp>$/) 337 expect(chef_run).to render_file(file.name).with_content(%r{^<EcomServerIp>emc_EcomServerIP_value</EcomServerIp>$})
338 end 338 end
339 339
340 it 'has EcomPassword' do 340 it 'has EcomPassword' do
341 node.set['openstack']['block-storage']['emc']['EcomUserName'] = 'emc_username' 341 node.set['openstack']['block-storage']['emc']['EcomUserName'] = 'emc_username'
342 expect(chef_run).to render_file(file.name).with_content(/^<EcomPassword>emc_test_pass<\/EcomPassword>$/) 342 expect(chef_run).to render_file(file.name).with_content(%r{^<EcomPassword>emc_test_pass</EcomPassword>$})
343 end 343 end
344 344
345 it 'does not have MaskingView when not specified' do 345 it 'does not have MaskingView when not specified' do
@@ -348,8 +348,7 @@ describe 'openstack-block-storage::volume' do
348 348
349 it 'has MaskingView when specified' do 349 it 'has MaskingView when specified' do
350 node.set['openstack']['block-storage']['emc']['MaskingView'] = 'testMaskingView' 350 node.set['openstack']['block-storage']['emc']['MaskingView'] = 'testMaskingView'
351 351 expect(chef_run).to render_file(file.name).with_content(%r{^<MaskingView>testMaskingView</MaskingView>$})
352 expect(chef_run).to render_file(file.name).with_content(/^<MaskingView>testMaskingView<\/MaskingView>$/)
353 end 352 end
354 end 353 end
355 end 354 end