diff --git a/.gitignore b/.gitignore index 5a29577..d7ee44a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ .bundle/ berks-cookbooks/ -.kitchen/ -.vagrant/ +.kitchen +.vagrant .coverage/ *.swp Berksfile.lock -Gemfile.lock Vagrantfile +Gemfile.lock diff --git a/.rubocop.yml b/.rubocop.yml index 69447d8..5e0be9f 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -1,5 +1,7 @@ +inherit_from: .rubocop_todo.yml + AllCops: - Includes: + Include: - metadata.rb - Gemfile - attributes/** @@ -8,12 +10,15 @@ AllCops: - recipes/** - resources/** - spec/** + Exclude: + - .cookbooks/**/* + - berks-cookbooks/**/* + - .bundle/**/* Encoding: Exclude: - metadata.rb - Gemfile - - berks-cookbooks/** NumericLiterals: Enabled: false diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml new file mode 100644 index 0000000..ec8987d --- /dev/null +++ b/.rubocop_todo.yml @@ -0,0 +1,55 @@ +# This configuration was generated by `rubocop --auto-gen-config` +# on 2015-02-27 14:45:01 -0600 using RuboCop version 0.29.1. +# The point is for the user to remove these configuration records +# one by one as the offenses are removed from the code base. +# Note that changes in the inspected code, or installation of new +# versions of RuboCop, may require this file to be generated again. + +# Offense count: 1 +Metrics/AbcSize: + Max: 28 + +# Offense count: 5 +# Configuration parameters: EnforcedStyle, SupportedStyles. +Style/ClassAndModuleChildren: + Enabled: false + +# Offense count: 3 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles. +Style/EmptyLinesAroundBlockBody: + Enabled: false + +# Offense count: 5 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles. +Style/FirstParameterIndentation: + Enabled: false + +# Offense count: 8 +# Configuration parameters: EnforcedStyle, SupportedStyles. +Style/FormatString: + Enabled: false + +# Offense count: 1 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles. +Style/MultilineOperationIndentation: + Enabled: false + +# Offense count: 6 +# Cop supports --auto-correct. +# Configuration parameters: PreferredDelimiters. +Style/PercentLiteralDelimiters: + Enabled: false + +# Offense count: 13 +# Cop supports --auto-correct. +Style/SingleSpaceBeforeFirstArg: + Enabled: false + +# Offense count: 1 +# Cop supports --auto-correct. +# Configuration parameters: IgnoredMethods. +Style/SymbolProc: + Enabled: false diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 354254a..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,136 +0,0 @@ -openstack-block-storage Cookbook CHANGELOG -============================== -This file is used to list changes made in each version of the openstack-block-storage cookbook. -## 10.1.0 -* Use common specific_endpoint routines (bug 1412919) -* Install qemu-img package for volume nodes -* update iscsi_helper for RHEL7 -* update cinder_iscsitarget_packages for RHEL7 -* update cinder_iscsitarget_service for RHEL7 - -## 10.0.1 -# Update cinder.conf mode from 0644 to 0640 -* Add attribute for ibmnas_platform_type -* Allow cafile, insecure, memcached_servers, memcache_security_strategy, memcache_secret_key and hash_algorithms to be configurable -* Bump Chef gem to 11.16 -* Update deprecated keystoneclient.middleware.auth_token in api-paste.ini -* Add attributes for quota_snapshots, no_snapshot_gb_quota and use_default_quota_class -* Add glance_api_insecure and make glance_api_servers to be prefixed with scheme -* Add sysfsutils package for storwize/SVC driver -* Add glance_ca_certificates_file -* Add default_volume_type config option -* Update gpfs volume driver path and fix gpfs_images_share_mode initialization -* Change to cinder v2 service and endpoint -* Add support for san_password with ibm.storwize_svc.StorwizeSVCDriver -* Add glance_api_version config option -* Allow san_private_key to be used instead of san_login for Storwize -* Add dependency on upstream ceph cookbook for better key management - -## 10.0.0 -* Upgrading to Juno -* Sync conf files with Juno -* Upgrading berkshelf from 2.0.18 to 3.1.5 -* Move keystone keys into cinder.conf -* Add attribute for osapi_volume_workers - -## 9.4.1 -* Add support for LVMISCSIDriver driver using block devices with LVM - -## 9.4.0 -* python_packages database client attributes have been migrated to -the -common cookbook -* bump berkshelf to 2.0.18 to allow Supermarket support -* added rootwrap.conf as a template -* fix fauxhai version for suse and redhat - -## 9.3.0 -### Blue print -* Add multiple backend configuration support - -## 9.2.3 -* Fix for storwize_svc_vol_rsize default - -## 9.2.2 -### Bug -* Add support for miscellaneous options (like in Compute) - -## 9.2.1 -### Bug -* Remove output of extra config lines in cinder.conf.erb - -## 9.2.0 -### Blue print -* Get VMware vCenter password from databag - -## 9.1.1 -* Fix package action to allow updates - -## 9.1.0 -### Blue print -* Remove policy template - -## 9.0.1 -### Bug -* Fix the depends cookbook version issue in metadata.rb - -## 9.0.0 -* Upgrade to Icehouse - -## 8.4.1 -### Bug -* Fix the DB2 ODBC driver issue -* Move control_exchange outside of 'rabbit' - -## 8.4.0 -### Blue print -* Use the library method auth_uri_transform - -## 8.3.0 -* Rename openstack-metering to openstack-telemetry - -## 8.2.0 -* VMware VMDK driver support - -## 8.1.0 -* Add client recipe - -## 8.0.0 -### New version -* Upgrade to upstream Havana release -* Add support for Storwize/SVC configuration attributes - -## 7.2.2 -### Bug -* fix a bug related to qpid. - -## 7.2.1 -### Bug -* relax the dependencies to the 7.x series - -## 7.2.0 -### Improvement -* Add qpid support for cinder. Default is rabbitmq - -## 7.1.0 -### Improvement -* Add new attributes for common rpc configuration - -## 7.0.6 -### Bug -* set auth_uri for authtoken in api-paste.ini (bug #1207504) - -## 7.0.4 -### Improvement -* Use a default log-file (/var/log/cinder/cinder.log) if syslog is disabled - -## 7.0.3 -### Bug -* change audit cronjob binary path depending on platform, refactored some tests - -## 7.0.2 -### Improvement -* ensure cronjob runs on only one node and make cronjob configurable - -## 7.0.1 -### Improvement -* Add audit cronjob and enable control_exchange, when metering enabled diff --git a/Gemfile b/Gemfile index daa81a9..14d48b3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,12 +1,11 @@ # encoding: UTF-8 source 'https://rubygems.org' -gem 'chef', '~> 11.16' +gem 'chef', '~> 11.18.6' gem 'json', '<= 1.7.7' # chef 11 dependency -gem 'berkshelf', '~> 3.1.5' +gem 'berkshelf', '~> 3.2.1' gem 'hashie', '~> 2.0' gem 'chefspec', '~> 4.0.0' gem 'rspec', '~> 3.0.0' -gem 'foodcritic', '~> 3.0.3' -gem 'rubocop', '~> 0.18.1' -gem 'fauxhai', '>= 2.1.0' +gem 'foodcritic', '~> 4.0' +gem 'rubocop', '~> 0.29.1' diff --git a/metadata.rb b/metadata.rb index b3f9b30..1f29ad3 100644 --- a/metadata.rb +++ b/metadata.rb @@ -5,7 +5,7 @@ maintainer_email 'opscode-chef-openstack@googlegroups.com' license 'Apache 2.0' description 'The OpenStack Advanced Volume Management service Cinder.' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '10.1.0' +version '11.0.0' recipe 'openstack-block-storage::api', 'Installs the cinder-api, sets up the cinder database, and cinder service/user/endpoints in keystone' recipe 'openstack-block-storage::client', 'Install packages required for cinder client' @@ -19,9 +19,9 @@ recipe 'openstack-block-storage::volume', 'Installs the cinder-volume end depends 'apt', '~> 2.6.1' -depends 'openstack-common', '>= 10.2.0' -depends 'openstack-identity', '>= 10.0.0' -depends 'openstack-image', '>= 10.0.0' +depends 'openstack-common', '>= 11.0.0' +depends 'openstack-identity', '>= 11.0.0' +depends 'openstack-image', '>= 11.0.0' depends 'selinux', '~> 0.7.2' depends 'python', '~> 1.4.6' depends 'ceph', '~> 0.8.0'