Browse Source

starting rocky development patch

Change-Id: Ifcb2cb9d3c3653cb7e41845af42e25ff7fa70772
Samuel Cassiba 8 months ago
parent
commit
5d36a509ba
5 changed files with 27 additions and 6 deletions
  1. 2
    0
      .rubocop.yml
  2. 19
    0
      .rubocop_todo.yml
  3. 1
    1
      Berksfile
  4. 3
    3
      metadata.rb
  5. 2
    2
      spec/spec_helper.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

+ 19
- 0
.rubocop_todo.yml View File

@@ -0,0 +1,19 @@
1
+# This configuration was generated by
2
+# `rubocop --auto-gen-config`
3
+# on 2018-08-03 05:26:10 -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: 1
10
+# Cop supports --auto-correct.
11
+Style/IfUnlessModifier:
12
+  Exclude:
13
+    - 'recipes/common.rb'
14
+
15
+# Offense count: 51
16
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
17
+# URISchemes: http, https
18
+Metrics/LineLength:
19
+  Max: 163

+ 1
- 1
Berksfile View File

@@ -9,6 +9,6 @@ source 'https://supermarket.chef.io'
9 9
 end
10 10
 
11 11
 cookbook 'openstackclient',
12
-  github: 'cloudbau/cookbook-openstackclient'
12
+  git: 'https://git.openstack.org/openstack/cookbook-openstackclient'
13 13
 
14 14
 metadata

+ 3
- 3
metadata.rb View File

@@ -4,14 +4,14 @@ maintainer_email 'openstack-dev@lists.openstack.org'
4 4
 license          'Apache-2.0'
5 5
 description      'Installs and configures the Heat Service'
6 6
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
7
-version          '17.0.0'
7
+version          '18.0.0'
8 8
 
9 9
 %w(ubuntu redhat centos).each do |os|
10 10
   supports os
11 11
 end
12 12
 
13
-depends 'openstack-common', '>= 17.0.0'
14
-depends 'openstack-identity', '>= 17.0.0'
13
+depends 'openstack-common', '>= 18.0.0'
14
+depends 'openstack-identity', '>= 18.0.0'
15 15
 depends 'openstackclient'
16 16
 
17 17
 issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url)

+ 2
- 2
spec/spec_helper.rb View File

@@ -240,7 +240,7 @@ end
240 240
 shared_examples 'logging' do
241 241
   context 'with logging enabled' do
242 242
     before do
243
-      node.set['openstack']['orchestration']['syslog']['use'] = true
243
+      node.override['openstack']['orchestration']['syslog']['use'] = true
244 244
     end
245 245
 
246 246
     it 'runs logging recipe if node attributes say to' do
@@ -250,7 +250,7 @@ shared_examples 'logging' do
250 250
 
251 251
   context 'with logging disabled' do
252 252
     before do
253
-      node.set['openstack']['orchestration']['syslog']['use'] = false
253
+      node.override['openstack']['orchestration']['syslog']['use'] = false
254 254
     end
255 255
 
256 256
     it "doesn't run logging recipe" do

Loading…
Cancel
Save