Browse Source

Initial kilo updates

Change-Id: Idf43a4af9c5a2d666fd3938a63fb8e7f5c74a5be
Partial-Bug: #1426424
Mark Vanderwiel 4 years ago
parent
commit
3d566f0146
6 changed files with 73 additions and 150 deletions
  1. 3
    3
      .gitignore
  2. 7
    2
      .rubocop.yml
  3. 55
    0
      .rubocop_todo.yml
  4. 0
    136
      CHANGELOG.md
  5. 4
    5
      Gemfile
  6. 4
    4
      metadata.rb

+ 3
- 3
.gitignore View File

@@ -1,9 +1,9 @@
1 1
 .bundle/
2 2
 berks-cookbooks/
3
-.kitchen/
4
-.vagrant/
3
+.kitchen
4
+.vagrant
5 5
 .coverage/
6 6
 *.swp
7 7
 Berksfile.lock
8
-Gemfile.lock
9 8
 Vagrantfile
9
+Gemfile.lock

+ 7
- 2
.rubocop.yml View File

@@ -1,5 +1,7 @@
1
+inherit_from: .rubocop_todo.yml
2
+
1 3
 AllCops:
2
-  Includes:
4
+  Include:
3 5
     - metadata.rb
4 6
     - Gemfile
5 7
     - attributes/**
@@ -8,12 +10,15 @@ AllCops:
8 10
     - recipes/**
9 11
     - resources/**
10 12
     - spec/**
13
+  Exclude:
14
+    - .cookbooks/**/*
15
+    - berks-cookbooks/**/*
16
+    - .bundle/**/*
11 17
 
12 18
 Encoding:
13 19
   Exclude:
14 20
     - metadata.rb
15 21
     - Gemfile
16
-    - berks-cookbooks/**
17 22
 
18 23
 NumericLiterals:
19 24
   Enabled: false

+ 55
- 0
.rubocop_todo.yml View File

@@ -0,0 +1,55 @@
1
+# This configuration was generated by `rubocop --auto-gen-config`
2
+# on 2015-02-27 14:45:01 -0600 using RuboCop version 0.29.1.
3
+# The point is for the user to remove these configuration records
4
+# one by one as the offenses are removed from the code base.
5
+# Note that changes in the inspected code, or installation of new
6
+# versions of RuboCop, may require this file to be generated again.
7
+
8
+# Offense count: 1
9
+Metrics/AbcSize:
10
+  Max: 28
11
+
12
+# Offense count: 5
13
+# Configuration parameters: EnforcedStyle, SupportedStyles.
14
+Style/ClassAndModuleChildren:
15
+  Enabled: false
16
+
17
+# Offense count: 3
18
+# Cop supports --auto-correct.
19
+# Configuration parameters: EnforcedStyle, SupportedStyles.
20
+Style/EmptyLinesAroundBlockBody:
21
+  Enabled: false
22
+
23
+# Offense count: 5
24
+# Cop supports --auto-correct.
25
+# Configuration parameters: EnforcedStyle, SupportedStyles.
26
+Style/FirstParameterIndentation:
27
+  Enabled: false
28
+
29
+# Offense count: 8
30
+# Configuration parameters: EnforcedStyle, SupportedStyles.
31
+Style/FormatString:
32
+  Enabled: false
33
+
34
+# Offense count: 1
35
+# Cop supports --auto-correct.
36
+# Configuration parameters: EnforcedStyle, SupportedStyles.
37
+Style/MultilineOperationIndentation:
38
+  Enabled: false
39
+
40
+# Offense count: 6
41
+# Cop supports --auto-correct.
42
+# Configuration parameters: PreferredDelimiters.
43
+Style/PercentLiteralDelimiters:
44
+  Enabled: false
45
+
46
+# Offense count: 13
47
+# Cop supports --auto-correct.
48
+Style/SingleSpaceBeforeFirstArg:
49
+  Enabled: false
50
+
51
+# Offense count: 1
52
+# Cop supports --auto-correct.
53
+# Configuration parameters: IgnoredMethods.
54
+Style/SymbolProc:
55
+  Enabled: false

+ 0
- 136
CHANGELOG.md View File

@@ -1,136 +0,0 @@
1
-openstack-block-storage Cookbook CHANGELOG
2
-==============================
3
-This file is used to list changes made in each version of the openstack-block-storage cookbook.
4
-## 10.1.0
5
-* Use common specific_endpoint routines (bug 1412919)
6
-* Install qemu-img package for volume nodes
7
-* update iscsi_helper for RHEL7
8
-* update cinder_iscsitarget_packages for RHEL7
9
-* update cinder_iscsitarget_service for RHEL7
10
-
11
-## 10.0.1
12
-# Update cinder.conf mode from 0644 to 0640
13
-* Add attribute for ibmnas_platform_type
14
-* Allow cafile, insecure, memcached_servers, memcache_security_strategy, memcache_secret_key and hash_algorithms to be configurable
15
-* Bump Chef gem to 11.16
16
-* Update deprecated keystoneclient.middleware.auth_token in api-paste.ini
17
-* Add attributes for quota_snapshots, no_snapshot_gb_quota and use_default_quota_class
18
-* Add glance_api_insecure and make glance_api_servers to be prefixed with scheme
19
-* Add sysfsutils package for storwize/SVC driver
20
-* Add glance_ca_certificates_file
21
-* Add default_volume_type config option
22
-* Update gpfs volume driver path and fix gpfs_images_share_mode initialization
23
-* Change to cinder v2 service and endpoint
24
-* Add support for san_password with ibm.storwize_svc.StorwizeSVCDriver
25
-* Add glance_api_version config option
26
-* Allow san_private_key to be used instead of san_login for Storwize
27
-* Add dependency on upstream ceph cookbook for better key management
28
-
29
-## 10.0.0
30
-* Upgrading to Juno
31
-* Sync conf files with Juno
32
-* Upgrading berkshelf from 2.0.18 to 3.1.5
33
-* Move keystone keys into cinder.conf
34
-* Add attribute for osapi_volume_workers
35
-
36
-## 9.4.1
37
-* Add support for LVMISCSIDriver driver using block devices with LVM
38
-
39
-## 9.4.0
40
-* python_packages database client attributes have been migrated to
41
-the -common cookbook
42
-* bump berkshelf to 2.0.18 to allow Supermarket support
43
-* added rootwrap.conf as a template
44
-* fix fauxhai version for suse and redhat
45
-
46
-## 9.3.0
47
-### Blue print
48
-* Add multiple backend configuration support
49
-
50
-## 9.2.3
51
-* Fix for storwize_svc_vol_rsize default
52
-
53
-## 9.2.2
54
-### Bug
55
-* Add support for miscellaneous options (like in Compute)
56
-
57
-## 9.2.1
58
-### Bug
59
-* Remove output of extra config lines in cinder.conf.erb
60
-
61
-## 9.2.0
62
-### Blue print
63
-* Get VMware vCenter password from databag
64
-
65
-## 9.1.1
66
-* Fix package action to allow updates
67
-
68
-## 9.1.0
69
-### Blue print
70
-* Remove policy template
71
-
72
-## 9.0.1
73
-### Bug
74
-* Fix the depends cookbook version issue in metadata.rb
75
-
76
-## 9.0.0
77
-* Upgrade to Icehouse
78
-
79
-## 8.4.1
80
-### Bug
81
-* Fix the DB2 ODBC driver issue
82
-* Move control_exchange outside of 'rabbit'
83
-
84
-## 8.4.0
85
-### Blue print
86
-* Use the library method auth_uri_transform
87
-
88
-## 8.3.0
89
-* Rename openstack-metering to openstack-telemetry
90
-
91
-## 8.2.0
92
-* VMware VMDK driver support
93
-
94
-## 8.1.0
95
-* Add client recipe
96
-
97
-## 8.0.0
98
-### New version
99
-* Upgrade to upstream Havana release
100
-* Add support for Storwize/SVC configuration attributes
101
-
102
-## 7.2.2
103
-### Bug
104
-* fix a bug related to qpid.
105
-
106
-## 7.2.1
107
-### Bug
108
-* relax the dependencies to the 7.x series
109
-
110
-## 7.2.0
111
-### Improvement
112
-* Add qpid support for cinder. Default is rabbitmq
113
-
114
-## 7.1.0
115
-### Improvement
116
-* Add new attributes for common rpc configuration
117
-
118
-## 7.0.6
119
-### Bug
120
-* set auth_uri for authtoken in api-paste.ini (bug #1207504)
121
-
122
-## 7.0.4
123
-### Improvement
124
-* Use a default log-file (/var/log/cinder/cinder.log) if syslog is disabled
125
-
126
-## 7.0.3
127
-### Bug
128
-* change audit cronjob binary path depending on platform, refactored some tests
129
-
130
-## 7.0.2
131
-### Improvement
132
-* ensure cronjob runs on only one node and make cronjob configurable
133
-
134
-## 7.0.1
135
-### Improvement
136
-* Add audit cronjob and enable control_exchange, when metering enabled

+ 4
- 5
Gemfile View File

@@ -1,12 +1,11 @@
1 1
 # encoding: UTF-8
2 2
 source 'https://rubygems.org'
3 3
 
4
-gem 'chef', '~> 11.16'
4
+gem 'chef', '~> 11.18.6'
5 5
 gem 'json', '<= 1.7.7' # chef 11 dependency
6
-gem 'berkshelf', '~> 3.1.5'
6
+gem 'berkshelf', '~> 3.2.1'
7 7
 gem 'hashie', '~> 2.0'
8 8
 gem 'chefspec', '~> 4.0.0'
9 9
 gem 'rspec', '~> 3.0.0'
10
-gem 'foodcritic', '~> 3.0.3'
11
-gem 'rubocop', '~> 0.18.1'
12
-gem 'fauxhai', '>= 2.1.0'
10
+gem 'foodcritic', '~> 4.0'
11
+gem 'rubocop', '~> 0.29.1'

+ 4
- 4
metadata.rb View File

@@ -5,7 +5,7 @@ maintainer_email 'opscode-chef-openstack@googlegroups.com'
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          '10.1.0'
8
+version          '11.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'
@@ -19,9 +19,9 @@ recipe           'openstack-block-storage::volume', 'Installs the cinder-volume
19 19
 end
20 20
 
21 21
 depends 'apt', '~> 2.6.1'
22
-depends 'openstack-common', '>= 10.2.0'
23
-depends 'openstack-identity', '>= 10.0.0'
24
-depends 'openstack-image', '>= 10.0.0'
22
+depends 'openstack-common', '>= 11.0.0'
23
+depends 'openstack-identity', '>= 11.0.0'
24
+depends 'openstack-image', '>= 11.0.0'
25 25
 depends 'selinux', '~> 0.7.2'
26 26
 depends 'python', '~> 1.4.6'
27 27
 depends 'ceph', '~> 0.8.0'

Loading…
Cancel
Save