Browse Source

starting rocky development patch

Change-Id: Ia24eef700ab6c7fe359a17070981dc93e0300a18
Samuel Cassiba 8 months ago
parent
commit
341c5b8098
6 changed files with 8 additions and 47 deletions
  1. 1
    43
      .rubocop_todo.yml
  2. 3
    0
      .zuul.yaml
  3. 1
    1
      libraries/openstack_base.rb
  4. 1
    1
      libraries/openstack_endpoint.rb
  5. 1
    1
      libraries/openstack_project.rb
  6. 1
    1
      metadata.rb

+ 1
- 43
.rubocop_todo.yml View File

@@ -1,55 +1,13 @@
1 1
 # This configuration was generated by
2 2
 # `rubocop --auto-gen-config`
3
-# on 2018-05-28 09:02:57 -0700 using RuboCop version 0.49.1.
3
+# on 2018-08-03 05:25:45 -0700 using RuboCop version 0.55.0.
4 4
 # The point is for the user to remove these configuration records
5 5
 # one by one as the offenses are removed from the code base.
6 6
 # Note that changes in the inspected code, or installation of new
7 7
 # versions of RuboCop, may require this file to be generated again.
8 8
 
9
-# Offense count: 20
10
-# Configuration parameters: CountComments, ExcludedMethods.
11
-Metrics/BlockLength:
12
-  Max: 196
13
-
14 9
 # Offense count: 28
15 10
 # Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
16 11
 # URISchemes: http, https
17 12
 Metrics/LineLength:
18 13
   Max: 100
19
-
20
-# Offense count: 7
21
-Style/Documentation:
22
-  Exclude:
23
-    - 'spec/**/*'
24
-    - 'test/**/*'
25
-    - 'libraries/openstack_base.rb'
26
-    - 'libraries/openstack_domain.rb'
27
-    - 'libraries/openstack_endpoint.rb'
28
-    - 'libraries/openstack_project.rb'
29
-    - 'libraries/openstack_role.rb'
30
-    - 'libraries/openstack_service.rb'
31
-    - 'libraries/openstack_user.rb'
32
-
33
-# Offense count: 5
34
-# Cop supports --auto-correct.
35
-# Configuration parameters: PreferredDelimiters.
36
-Style/PercentLiteralDelimiters:
37
-  Exclude:
38
-    - 'Rakefile'
39
-    - 'metadata.rb'
40
-    - 'spec/cookbooks/openstackclient_test/recipes/endpoint.rb'
41
-    - 'spec/endpoint_spec.rb'
42
-
43
-# Offense count: 7
44
-# Cop supports --auto-correct.
45
-# Configuration parameters: EnforcedStyleForMultiline, SupportedStylesForMultiline.
46
-# SupportedStylesForMultiline: comma, consistent_comma, no_comma
47
-Style/TrailingCommaInLiteral:
48
-  Exclude:
49
-    - 'spec/cookbooks/openstackclient_test/recipes/domain.rb'
50
-    - 'spec/cookbooks/openstackclient_test/recipes/endpoint.rb'
51
-    - 'spec/cookbooks/openstackclient_test/recipes/project.rb'
52
-    - 'spec/cookbooks/openstackclient_test/recipes/role.rb'
53
-    - 'spec/cookbooks/openstackclient_test/recipes/service.rb'
54
-    - 'spec/cookbooks/openstackclient_test/recipes/user.rb'
55
-    - 'spec/spec_helper.rb'

+ 3
- 0
.zuul.yaml View File

@@ -0,0 +1,3 @@
1
+- project:
2
+    templates:
3
+      - openstack-chef-repo-jobs

+ 1
- 1
libraries/openstack_base.rb View File

@@ -15,7 +15,7 @@
15 15
 #  limitations under the License.
16 16
 
17 17
 module OpenstackclientCookbook
18
-  class OpenstackBase < Chef::Resource
18
+  class OpenstackBase < Chef::Resource::LWRPBase
19 19
     require 'fog/openstack'
20 20
     def connection
21 21
       @connection_cache ||= Fog::Identity::OpenStack.new(connection_params)

+ 1
- 1
libraries/openstack_endpoint.rb View File

@@ -55,7 +55,7 @@ module OpenstackclientCookbook
55 55
       if endpoint
56 56
         new_resource.connection.endpoints.destroy(endpoint.id)
57 57
       else
58
-        log "#{interface}_endpoint for \"#{service_name}\" doesn't exist"
58
+        log "#{new_resource.interface}_endpoint for \"#{new_resource.service_name}\" doesn't exist"
59 59
       end
60 60
     end
61 61
   end

+ 1
- 1
libraries/openstack_project.rb View File

@@ -38,7 +38,7 @@ module OpenstackclientCookbook
38 38
       if project
39 39
         project.destroy
40 40
       else
41
-        log "Project with name: \"#{project_name}\" doesn't exist"
41
+        log "Project with name: \"#{new_resource.project_name}\" doesn't exist"
42 42
       end
43 43
     end
44 44
   end

+ 1
- 1
metadata.rb View File

@@ -6,7 +6,7 @@ description 'Installs the fog-openstack gem and offers LWRPs to use it'
6 6
 issues_url 'https://launchpad.net/openstack-chef'
7 7
 source_url 'https://git.openstack.org/openstack/cookbook-openstack-client'
8 8
 chef_version '>= 12.5' if respond_to?(:chef_version)
9
-version '17.0.0'
9
+version '18.0.0'
10 10
 
11 11
 %w(ubuntu redhat centos).each do |os|
12 12
   supports os

Loading…
Cancel
Save