Browse Source

starting rocky development patch

Change-Id: If050a2d628edce724031bb19deb45f196ceb4a66
Samuel Cassiba 8 months ago
parent
commit
e302e88e25
6 changed files with 21 additions and 6 deletions
  1. 2
    0
      .rubocop.yml
  2. 13
    0
      .rubocop_todo.yml
  3. 2
    2
      metadata.rb
  4. 1
    1
      spec/client_spec.rb
  5. 2
    2
      spec/mysql-server_spec.rb
  6. 1
    1
      spec/server_spec.rb

+ 2
- 0
.rubocop.yml View File

@@ -1,3 +1,5 @@
1
+inherit_from: .rubocop_todo.yml
2
+
1 3
 AllCops:
2 4
   Include:
3 5
     - metadata.rb

+ 13
- 0
.rubocop_todo.yml View File

@@ -0,0 +1,13 @@
1
+# This configuration was generated by
2
+# `rubocop --auto-gen-config`
3
+# on 2018-08-03 05:26:07 -0700 using RuboCop version 0.55.0.
4
+# The point is for the user to remove these configuration records
5
+# one by one as the offenses are removed from the code base.
6
+# Note that changes in the inspected code, or installation of new
7
+# versions of RuboCop, may require this file to be generated again.
8
+
9
+# Offense count: 28
10
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
11
+# URISchemes: http, https
12
+Metrics/LineLength:
13
+  Max: 113

+ 2
- 2
metadata.rb View File

@@ -3,7 +3,7 @@ maintainer       'openstack-chef'
3 3
 maintainer_email 'openstack-dev@lists.openstack.org'
4 4
 license          'Apache-2.0'
5 5
 description      'Provides the shared database configuration for OpenStack'
6
-version          '17.0.0'
6
+version          '18.0.0'
7 7
 
8 8
 recipe 'client', 'Installs client packages for the database used by the deployment.'
9 9
 recipe 'server', 'Installs and configures server packages for the database used by the deployment.'
@@ -19,7 +19,7 @@ recipe 'openstack-db', 'Creates necessary tables, users, and grants for OpenStac
19 19
   supports os
20 20
 end
21 21
 
22
-depends 'openstack-common', '>= 17.0.0'
22
+depends 'openstack-common', '>= 18.0.0'
23 23
 
24 24
 depends 'mariadb', '~> 1.5'
25 25
 depends 'mysql', '~> 8.2'

+ 1
- 1
spec/client_spec.rb View File

@@ -10,7 +10,7 @@ describe 'openstack-ops-database::client' do
10 10
     let(:chef_run) { runner.converge(described_recipe) }
11 11
 
12 12
     it 'uses mariadb client recipe by default' do
13
-      node.set['openstack']['db']['service_type'] = 'mariadb'
13
+      node.override['openstack']['db']['service_type'] = 'mariadb'
14 14
       expect(chef_run).to include_recipe 'openstack-ops-database::mariadb-client'
15 15
     end
16 16
   end

+ 2
- 2
spec/mysql-server_spec.rb View File

@@ -26,8 +26,8 @@ describe 'openstack-ops-database::mysql-server' do
26 26
 
27 27
     describe 'creates mysql service with different values' do
28 28
       before do
29
-        node.set['openstack']['mysql']['data_dir'] = '/other-dir'
30
-        node.set['openstack']['mysql']['version'] = '5.7'
29
+        node.override['openstack']['mysql']['data_dir'] = '/other-dir'
30
+        node.override['openstack']['mysql']['version'] = '5.7'
31 31
       end
32 32
       it do
33 33
         expect(chef_run).to create_mysql_service('default').with(

+ 1
- 1
spec/server_spec.rb View File

@@ -10,7 +10,7 @@ describe 'openstack-ops-database::server' do
10 10
     let(:chef_run) { runner.converge(described_recipe) }
11 11
 
12 12
     it 'uses mariadb server recipe by default' do
13
-      node.set['openstack']['db']['service_type'] = 'mariadb'
13
+      node.override['openstack']['db']['service_type'] = 'mariadb'
14 14
       expect(chef_run).to include_recipe('openstack-ops-database::mariadb-server')
15 15
     end
16 16
   end

Loading…
Cancel
Save