Browse Source

Initial Liberty Changes

Metadata changes
- Updated maintainer email
- Updated the version

rubocop updates
remove db2 refs

Change-Id: I4be2304091443ee173ebb4605e24b54c699b929a
Mark Vanderwiel 3 years ago
parent
commit
b2b093cc3b

+ 5
- 5
metadata.rb View File

@@ -1,11 +1,11 @@
1 1
 # encoding: UTF-8
2 2
 name 'openstack-block-storage'
3 3
 maintainer 'openstack-chef'
4
-maintainer_email 'opscode-chef-openstack@googlegroups.com'
4
+maintainer_email 'openstack-dev@lists.openstack.org'
5 5
 license 'Apache 2.0'
6 6
 description 'The OpenStack Advanced Volume Management service Cinder.'
7 7
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
8
-version '11.1.0'
8
+version '12.0.0'
9 9
 
10 10
 recipe 'openstack-block-storage::api', 'Installs the cinder-api, sets up the cinder database, and cinder service/user/endpoints in keystone'
11 11
 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'
20 20
 end
21 21
 
22 22
 depends 'apt', '~> 2.6.1'
23
-depends 'openstack-common', '>= 11.5.0'
24
-depends 'openstack-identity', '>= 11.0.0'
25
-depends 'openstack-image', '>= 11.0.0'
23
+depends 'openstack-common', '>= 12.0.0'
24
+depends 'openstack-identity', '>= 12.0.0'
25
+depends 'openstack-image', '>= 12.0.0'
26 26
 depends 'selinux', '~> 0.9.0'
27 27
 depends 'python', '~> 1.4.6'
28 28
 depends 'ceph', '~> 0.8.0'

+ 0
- 8
spec/api-redhat_spec.rb View File

@@ -20,14 +20,6 @@ describe 'openstack-block-storage::api' do
20 20
       expect(chef_run).to upgrade_package 'MySQL-python'
21 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 23
     it 'upgrades postgresql python packages if explicitly told' do
32 24
       node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
33 25
 

+ 0
- 8
spec/backup-redhat_spec.rb View File

@@ -29,14 +29,6 @@ describe 'openstack-block-storage::backup' do
29 29
         expect(chef_run).to upgrade_package 'MySQL-python'
30 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 32
       it 'upgrades postgresql python packages if explicitly told' do
41 33
         node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
42 34
 

+ 0
- 8
spec/scheduler-redhat_spec.rb View File

@@ -32,14 +32,6 @@ describe 'openstack-block-storage::scheduler' do
32 32
       expect(chef_run).to upgrade_package 'MySQL-python'
33 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 35
     it 'upgrades postgresql python packages if explicitly told' do
44 36
       node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
45 37
 

+ 0
- 8
spec/volume-redhat_spec.rb View File

@@ -16,14 +16,6 @@ describe 'openstack-block-storage::volume' do
16 16
       expect(chef_run).to upgrade_package('MySQL-python')
17 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 19
     it 'upgrades postgresql python packages if explicitly told' do
28 20
       node.set['openstack']['db']['block-storage']['service_type'] = 'postgresql'
29 21
 

+ 5
- 6
spec/volume_spec.rb View File

@@ -68,7 +68,7 @@ describe 'openstack-block-storage::volume' do
68 68
             owner: 'cinder',
69 69
             group: 'cinder',
70 70
             mode: '0600'
71
-        )
71
+          )
72 72
         end
73 73
 
74 74
         it 'sets the ibmnas access_ip attribute' do
@@ -328,18 +328,18 @@ describe 'openstack-block-storage::volume' do
328 328
         %w(StorageType EcomServerPort EcomUserName).each do |attr|
329 329
           it "has an emc #{attr} setting" do
330 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 332
           end
333 333
         end
334 334
 
335 335
         it 'has a EcomServerIP' do
336 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 338
         end
339 339
 
340 340
         it 'has EcomPassword' do
341 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 343
         end
344 344
 
345 345
         it 'does not have MaskingView when not specified' do
@@ -348,8 +348,7 @@ describe 'openstack-block-storage::volume' do
348 348
 
349 349
         it 'has MaskingView when specified' do
350 350
           node.set['openstack']['block-storage']['emc']['MaskingView'] = 'testMaskingView'
351
-
352
-          expect(chef_run).to render_file(file.name).with_content(/^<MaskingView>testMaskingView<\/MaskingView>$/)
351
+          expect(chef_run).to render_file(file.name).with_content(%r{^<MaskingView>testMaskingView</MaskingView>$})
353 352
         end
354 353
       end
355 354
     end

Loading…
Cancel
Save