From 929ba461219952529d9a27096af3a1776f4c64cf Mon Sep 17 00:00:00 2001 From: Mark Vanderwiel Date: Fri, 27 Feb 2015 14:20:11 -0600 Subject: [PATCH] Initial kilo updates Change-Id: Ifca672583439b401b342753592895075f1429993 Partial-Bug: #1426424 --- .gitignore | 6 +- .rubocop.yml | 9 ++- .rubocop_todo.yml | 33 ++++++++ CHANGELOG.md | 48 ----------- Gemfile | 9 +-- LICENSE | 201 ---------------------------------------------- metadata.rb | 4 +- 7 files changed, 49 insertions(+), 261 deletions(-) create mode 100644 .rubocop_todo.yml delete mode 100644 CHANGELOG.md delete mode 100644 LICENSE 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..79a8e96 --- /dev/null +++ b/.rubocop_todo.yml @@ -0,0 +1,33 @@ +# This configuration was generated by `rubocop --auto-gen-config` +# on 2015-02-27 14:19:29 -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 +# Configuration parameters: EnforcedStyle, SupportedStyles. +Style/ClassAndModuleChildren: + Enabled: false + +# Offense count: 1 +# Cop supports --auto-correct. +# Configuration parameters: EnforcedStyle, SupportedStyles. +Style/EmptyLinesAroundBlockBody: + Enabled: false + +# Offense count: 2 +# Cop supports --auto-correct. +Style/IndentArray: + Enabled: false + +# Offense count: 1 +# Cop supports --auto-correct. +# Configuration parameters: PreferredDelimiters. +Style/PercentLiteralDelimiters: + Enabled: false + +# Offense count: 5 +# Cop supports --auto-correct. +Style/SingleSpaceBeforeFirstArg: + Enabled: false diff --git a/CHANGELOG.md b/CHANGELOG.md deleted file mode 100644 index 4ed90f6..0000000 --- a/CHANGELOG.md +++ /dev/null @@ -1,48 +0,0 @@ -# CHANGELOG for cookbook-openstack-ops-messaging - -This file is used to list changes made in each version of cookbook-openstack-ops-messaging. - -## 10.0.1 -* Configure rabbitmq port for both ssl and non-ssl cases -* Fix metadata version constraint for common -* Bump Chef gem to 11.16 -* No need to push our rabbit user/password to rabbit cookbook -* Add a temp workaround for an issue #153 in rabbit cookbook to notify - rabbitmq-server to restart immediately. -* Add another workaround for the issue #153 in rabbit cookbook -* Allow cluster_disk_nodes not to be set to allow on-the-fly mq clusters - -## 10.0.0 -* Upgrading to Juno -* Upgrading berkshelf from 2.0.18 to 3.1.5 - -## 9.0.1 -### Bug -* Fix the depends cookbook version issue in metadata.rb -* bump berkshelf to 2.0.18 to allow Supermarket support -* fix fauxhai version for suse - -## 9.0.0 -* Upgrade to Icehouse - -## 8.0.1: -* Add change_password to make rabbitmq work when develop_mode=false - -## 8.0.0 -* upgrade to Havana - -## 7.0.1: - -* default the node['openstack'][*]['rabbit'] attributes for all the services - using rabbitmq (block-storage, compute, image, metering, network) to whatever - node['openstack']['mq'] attributes are set. - -## 7.0.0 - -* Initial release intended for Grizzly-based OpenStack releases, - for use with Stackforge upstream repositories. - -- - - -Check the [Markdown Syntax Guide](http://daringfireball.net/projects/markdown/syntax) for help with Markdown. - -The [Github Flavored Markdown page](http://github.github.com/github-flavored-markdown/) describes the differences between markdown on github and standard markdown. 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/LICENSE b/LICENSE deleted file mode 100644 index 11069ed..0000000 --- a/LICENSE +++ /dev/null @@ -1,201 +0,0 @@ - Apache License - Version 2.0, January 2004 - http://www.apache.org/licenses/ - -TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION - -1. Definitions. - - "License" shall mean the terms and conditions for use, reproduction, - and distribution as defined by Sections 1 through 9 of this document. - - "Licensor" shall mean the copyright owner or entity authorized by - the copyright owner that is granting the License. - - "Legal Entity" shall mean the union of the acting entity and all - other entities that control, are controlled by, or are under common - control with that entity. For the purposes of this definition, - "control" means (i) the power, direct or indirect, to cause the - direction or management of such entity, whether by contract or - otherwise, or (ii) ownership of fifty percent (50%) or more of the - outstanding shares, or (iii) beneficial ownership of such entity. - - "You" (or "Your") shall mean an individual or Legal Entity - exercising permissions granted by this License. - - "Source" form shall mean the preferred form for making modifications, - including but not limited to software source code, documentation - source, and configuration files. - - "Object" form shall mean any form resulting from mechanical - transformation or translation of a Source form, including but - not limited to compiled object code, generated documentation, - and conversions to other media types. - - "Work" shall mean the work of authorship, whether in Source or - Object form, made available under the License, as indicated by a - copyright notice that is included in or attached to the work - (an example is provided in the Appendix below). - - "Derivative Works" shall mean any work, whether in Source or Object - form, that is based on (or derived from) the Work and for which the - editorial revisions, annotations, elaborations, or other modifications - represent, as a whole, an original work of authorship. For the purposes - of this License, Derivative Works shall not include works that remain - separable from, or merely link (or bind by name) to the interfaces of, - the Work and Derivative Works thereof. - - "Contribution" shall mean any work of authorship, including - the original version of the Work and any modifications or additions - to that Work or Derivative Works thereof, that is intentionally - submitted to Licensor for inclusion in the Work by the copyright owner - or by an individual or Legal Entity authorized to submit on behalf of - the copyright owner. For the purposes of this definition, "submitted" - means any form of electronic, verbal, or written communication sent - to the Licensor or its representatives, including but not limited to - communication on electronic mailing lists, source code control systems, - and issue tracking systems that are managed by, or on behalf of, the - Licensor for the purpose of discussing and improving the Work, but - excluding communication that is conspicuously marked or otherwise - designated in writing by the copyright owner as "Not a Contribution." - - "Contributor" shall mean Licensor and any individual or Legal Entity - on behalf of whom a Contribution has been received by Licensor and - subsequently incorporated within the Work. - -2. Grant of Copyright License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - copyright license to reproduce, prepare Derivative Works of, - publicly display, publicly perform, sublicense, and distribute the - Work and such Derivative Works in Source or Object form. - -3. Grant of Patent License. Subject to the terms and conditions of - this License, each Contributor hereby grants to You a perpetual, - worldwide, non-exclusive, no-charge, royalty-free, irrevocable - (except as stated in this section) patent license to make, have made, - use, offer to sell, sell, import, and otherwise transfer the Work, - where such license applies only to those patent claims licensable - by such Contributor that are necessarily infringed by their - Contribution(s) alone or by combination of their Contribution(s) - with the Work to which such Contribution(s) was submitted. If You - institute patent litigation against any entity (including a - cross-claim or counterclaim in a lawsuit) alleging that the Work - or a Contribution incorporated within the Work constitutes direct - or contributory patent infringement, then any patent licenses - granted to You under this License for that Work shall terminate - as of the date such litigation is filed. - -4. Redistribution. You may reproduce and distribute copies of the - Work or Derivative Works thereof in any medium, with or without - modifications, and in Source or Object form, provided that You - meet the following conditions: - - (a) You must give any other recipients of the Work or - Derivative Works a copy of this License; and - - (b) You must cause any modified files to carry prominent notices - stating that You changed the files; and - - (c) You must retain, in the Source form of any Derivative Works - that You distribute, all copyright, patent, trademark, and - attribution notices from the Source form of the Work, - excluding those notices that do not pertain to any part of - the Derivative Works; and - - (d) If the Work includes a "NOTICE" text file as part of its - distribution, then any Derivative Works that You distribute must - include a readable copy of the attribution notices contained - within such NOTICE file, excluding those notices that do not - pertain to any part of the Derivative Works, in at least one - of the following places: within a NOTICE text file distributed - as part of the Derivative Works; within the Source form or - documentation, if provided along with the Derivative Works; or, - within a display generated by the Derivative Works, if and - wherever such third-party notices normally appear. The contents - of the NOTICE file are for informational purposes only and - do not modify the License. You may add Your own attribution - notices within Derivative Works that You distribute, alongside - or as an addendum to the NOTICE text from the Work, provided - that such additional attribution notices cannot be construed - as modifying the License. - - You may add Your own copyright statement to Your modifications and - may provide additional or different license terms and conditions - for use, reproduction, or distribution of Your modifications, or - for any such Derivative Works as a whole, provided Your use, - reproduction, and distribution of the Work otherwise complies with - the conditions stated in this License. - -5. Submission of Contributions. Unless You explicitly state otherwise, - any Contribution intentionally submitted for inclusion in the Work - by You to the Licensor shall be under the terms and conditions of - this License, without any additional terms or conditions. - Notwithstanding the above, nothing herein shall supersede or modify - the terms of any separate license agreement you may have executed - with Licensor regarding such Contributions. - -6. Trademarks. This License does not grant permission to use the trade - names, trademarks, service marks, or product names of the Licensor, - except as required for reasonable and customary use in describing the - origin of the Work and reproducing the content of the NOTICE file. - -7. Disclaimer of Warranty. Unless required by applicable law or - agreed to in writing, Licensor provides the Work (and each - Contributor provides its Contributions) on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or - implied, including, without limitation, any warranties or conditions - of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A - PARTICULAR PURPOSE. You are solely responsible for determining the - appropriateness of using or redistributing the Work and assume any - risks associated with Your exercise of permissions under this License. - -8. Limitation of Liability. In no event and under no legal theory, - whether in tort (including negligence), contract, or otherwise, - unless required by applicable law (such as deliberate and grossly - negligent acts) or agreed to in writing, shall any Contributor be - liable to You for damages, including any direct, indirect, special, - incidental, or consequential damages of any character arising as a - result of this License or out of the use or inability to use the - Work (including but not limited to damages for loss of goodwill, - work stoppage, computer failure or malfunction, or any and all - other commercial damages or losses), even if such Contributor - has been advised of the possibility of such damages. - -9. Accepting Warranty or Additional Liability. While redistributing - the Work or Derivative Works thereof, You may choose to offer, - and charge a fee for, acceptance of support, warranty, indemnity, - or other liability obligations and/or rights consistent with this - License. However, in accepting such obligations, You may act only - on Your own behalf and on Your sole responsibility, not on behalf - of any other Contributor, and only if You agree to indemnify, - defend, and hold each Contributor harmless for any liability - incurred by, or claims asserted against, such Contributor by reason - of your accepting any such warranty or additional liability. - -END OF TERMS AND CONDITIONS - -APPENDIX: How to apply the Apache License to your work. - - To apply the Apache License to your work, attach the following - boilerplate notice, with the fields enclosed by brackets "[]" - replaced with your own identifying information. (Don't include - the brackets!) The text should be enclosed in the appropriate - comment syntax for the file format. We also recommend that a - file or class name and description of purpose be included on the - same "printed page" as the copyright notice for easier - identification within third-party archives. - -Copyright [yyyy] [name of copyright owner] - -Licensed under the Apache License, Version 2.0 (the "License"); -you may not use this file except in compliance with the License. -You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - -Unless required by applicable law or agreed to in writing, software -distributed under the License is distributed on an "AS IS" BASIS, -WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -See the License for the specific language governing permissions and -limitations under the License. diff --git a/metadata.rb b/metadata.rb index 529ce65..f2cf991 100644 --- a/metadata.rb +++ b/metadata.rb @@ -4,7 +4,7 @@ maintainer 'openstack-chef' maintainer_email 'opscode-chef-openstack@googlegroups.com' license 'Apache 2.0' description 'Provides the shared messaging configuration for Chef for OpenStack.' -version '10.0.1' +version '11.0.0' recipe 'server', 'Installs and configures server packages for messaging queue used by the deployment.' recipe 'rabbitmq-server', 'Installs and configures RabbitMQ and is called via the server recipe' @@ -13,5 +13,5 @@ recipe 'rabbitmq-server', 'Installs and configures RabbitMQ and is called via th supports os end -depends 'openstack-common', '>= 10.0.0' +depends 'openstack-common', '>= 11.0.0' depends 'rabbitmq', '~> 3.9.0'