From 8ca986118daa3fc570c4b63f9eedc55552186cd7 Mon Sep 17 00:00:00 2001 From: Mark Vanderwiel Date: Fri, 27 Feb 2015 14:16:12 -0600 Subject: [PATCH] Initial kilo updates Change-Id: I59dd90688058f9933e75b4bc302b9b71e5a64c6f Partial-Bug: #1426424 --- .gitignore | 6 ++--- .rubocop.yml | 9 +++++-- .rubocop_todo.yml | 38 +++++++++++++++++++++++++++ CHANGELOG.md | 65 ----------------------------------------------- Gemfile | 9 +++---- metadata.rb | 6 ++--- 6 files changed, 55 insertions(+), 78 deletions(-) create mode 100644 .rubocop_todo.yml delete mode 100644 CHANGELOG.md diff --git a/.gitignore b/.gitignore index 19577c1..d7ee44a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,9 @@ .bundle/ berks-cookbooks/ -.kitchen/ -.vagrant/ +.kitchen +.vagrant .coverage/ *.swp Berksfile.lock +Vagrantfile Gemfile.lock -Vagrantfile \ No newline at end of file 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..4736be6 --- /dev/null +++ b/.rubocop_todo.yml @@ -0,0 +1,38 @@ +# This configuration was generated by `rubocop --auto-gen-config` +# on 2015-02-27 14:14:06 -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: 18 + +# Offense count: 3 +# 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: 3 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles. +Style/FirstParameterIndentation: + Enabled: false + +# Offense count: 1 +# Cop supports --auto-correct. +# Configuration parameters: PreferredDelimiters. +Style/PercentLiteralDelimiters: + Enabled: false + +# Offense count: 34 +# Cop supports --auto-correct. +Style/SingleSpaceBeforeFirstArg: + Enabled: false diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 798b1b8..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,65 +0,0 @@ -# CHANGELOG for cookbook-openstack-orchestration - -This file is used to list changes made in each version of cookbook-openstack-orchestration - -## 10.0.0 -* Upgrading to Juno -* Sync conf files with Juno -* Upgrading berkshelf from 2.0.18 to 3.1.5 -* Update mode for heat.conf from 644 to 640 -* Add cafile, memcached_servers, memcache_security_strategy, memcache_secret_key, insecure and hash_algorithms so that they are configurable. -* Add attributes for stack role and domain users -* Bump Chef gem to 11.16 -* Create role and domain setup for heat template defined users -* Add cert_file, key_file, ca_file and insecure for clients so that they are configurable. -* Make 3 schemes configurable instead of being the hardcoded http -* Add misc options for heat.conf -* Add cert_file, key_file, ca_file and insecure for clients_XXX so that they are configurable. -* Add security arguments for heat-keystone-setup-domain command -* Allow domain id as attribute -* Add rabbit_ha_queues=True when rabbit HA is enabled -* Use common specific_endpoint routines (bug 1412919) -* Use identity-internal endpoint (bug 1412919) - -## 9.2.0 -* python_packages database client attributes have been migrated to -the -common cookbook -* bump berkshelf to 2.0.18 to allow Supermarket support -* fix fauxhai version for suse and redhat - -## 9.1.6 -* Allow region_name_for_services to be overridden - -## 9.1.5 -* Fix to properly set signing_dir - -## 9.1.4 -* Fix ability to configure separate endpoint and bind addresses - -## 9.1.3 -* Fix package reference, need keystone client not keystone - -## 9.1.2 -* Fix endpoint ref in heat conf - -## 9.1.1 -* Revert bug 1279577 Create api-cfn identity registrations bug 1309123 - -## 9.1.0 -* Add notification attributes - -## 9.0.1 -* Remove policy file - -## 9.0.0 -* Upgrade to Icehouse - -## 8.1.1 -### Bug -* Fix the DB2 ODBC driver issue - -## 8.1.0 -* Add client recipe - -## 8.0.0: -* Initial release of cookbook-openstack-orchestration. diff --git a/Gemfile b/Gemfile index 9eb2a6b..1299374 100644 --- a/Gemfile +++ b/Gemfile @@ -1,11 +1,10 @@ -# encoding: UTF-8 source 'https://rubygems.org' -gem 'chef', '~> 11.16.0' +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 'foodcritic', '~> 4.0' +gem 'rubocop', '~> 0.29.1' diff --git a/metadata.rb b/metadata.rb index 840e10b..4e8bbfc 100644 --- a/metadata.rb +++ b/metadata.rb @@ -5,7 +5,7 @@ maintainer_email 'opscode-chef-openstack@googlegroups.com' license 'Apache 2.0' description 'Installs and configures the Heat Service' long_description IO.read(File.join(File.dirname(__FILE__), 'README.md')) -version '10.0' +version '11.0.0' recipe 'openstack-orchestration::api', 'Start and configure the Heat API service' recipe 'openstack-orchestration::api-cfn', 'Start and configure the Heat API CloudFormation service' recipe 'openstack-orchestration::api-cloudwatch', 'Start and configure the Heat API CloudWatch service' @@ -18,5 +18,5 @@ recipe 'openstack-orchestration::identity_registration', 'Registers H supports os end -depends 'openstack-common', '>= 10.2.0' -depends 'openstack-identity', '>= 10.0.0' +depends 'openstack-common', '>= 11.0.0' +depends 'openstack-identity', '>= 11.0.0'