diff --git a/Berksfile b/Berksfile index 50da25e..7548790 100644 --- a/Berksfile +++ b/Berksfile @@ -1,6 +1,6 @@ -source "https://supermarket.chef.io" +source 'https://supermarket.chef.io' metadata -cookbook "openstack-common", - github: "openstack/cookbook-openstack-common" +cookbook 'openstack-common', + github: 'openstack/cookbook-openstack-common' diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..68c771a --- /dev/null +++ b/LICENSE @@ -0,0 +1,176 @@ + + 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. + diff --git a/Rakefile b/Rakefile index c9edb13..137cc2f 100644 --- a/Rakefile +++ b/Rakefile @@ -1,40 +1,39 @@ -task default: ["test"] +task default: ['test'] -task :test => [:syntax, :lint, :unit] +task test: [:syntax, :lint, :unit] -desc "Vendor the cookbooks in the Berksfile" +desc 'Vendor the cookbooks in the Berksfile' task :berks_prep do - sh %{chef exec berks vendor} + sh %(chef exec berks vendor) end -desc "Run FoodCritic (syntax) tests" +desc 'Run FoodCritic (syntax) tests' task :syntax do - sh %{chef exec foodcritic --exclude spec -f any .} + sh %(chef exec foodcritic --exclude spec -f any .) end -desc "Run RuboCop (lint) tests" +desc 'Run RuboCop (lint) tests' task :lint do - sh %{chef exec cookstyle} + sh %(chef exec cookstyle) end -desc "Run RSpec (unit) tests" -task :unit => :berks_prep do - sh %{chef exec rspec --format documentation} +desc 'Run RSpec (unit) tests' +task unit: :berks_prep do + sh %(chef exec rspec --format documentation) end -desc "Remove the berks-cookbooks directory and the Berksfile.lock" +desc 'Remove the berks-cookbooks directory and the Berksfile.lock' task :clean do rm_rf [ 'berks-cookbooks', - 'Berksfile.lock' + 'Berksfile.lock', ] end -desc "All-in-One Neutron build Infra using Common task" +desc 'All-in-One Neutron build Infra using Common task' task :integration do # Use the common integration task sh %(wget -nv -t 3 -O Rakefile-Common https://raw.githubusercontent.com/openstack/cookbook-openstack-common/master/Rakefile) load './Rakefile-Common' - Rake::Task["common_integration"].invoke + Rake::Task['common_integration'].invoke end - diff --git a/metadata.rb b/metadata.rb index da005ce..3b6f7f2 100644 --- a/metadata.rb +++ b/metadata.rb @@ -1,7 +1,7 @@ name 'openstack-ops-messaging' maintainer 'openstack-chef' maintainer_email 'openstack-dev@lists.openstack.org' -license 'Apache 2.0' +license 'Apache-2.0' description 'Provides the shared messaging configuration for Chef for OpenStack.' version '16.0.0' @@ -13,7 +13,7 @@ recipe 'rabbitmq-server', 'Installs and configures RabbitMQ and is called via th end depends 'openstack-common', '>= 16.0.0' -depends 'rabbitmq', '~> 4.10' +depends 'rabbitmq' issues_url 'https://launchpad.net/openstack-chef' if respond_to?(:issues_url) source_url 'https://github.com/openstack/cookbook-openstack-ops-messaging' if respond_to?(:source_url) diff --git a/recipes/rabbitmq-server.rb b/recipes/rabbitmq-server.rb index a6e5291..ecb61b5 100644 --- a/recipes/rabbitmq-server.rb +++ b/recipes/rabbitmq-server.rb @@ -28,18 +28,19 @@ user = node['openstack']['mq']['user'] pass = get_password 'user', user vhost = node['openstack']['mq']['vhost'] bind_mq = node['openstack']['bind_service']['mq'] +bind_mq = bind_mq bind_mq_address = bind_address bind_mq # Used by OpenStack#rabbit_servers/#rabbit_server -node.set['openstack']['mq']['listen'] = bind_mq_address +node.normal['openstack']['mq']['listen'] = bind_mq_address if node['openstack']['mq']['rabbitmq']['use_ssl'] - if node['rabbitmq']['ssl_port'] != bind_mq.port - node.normal['rabbitmq']['ssl_port'] = bind_mq.port + if node['rabbitmq']['ssl_port'] != bind_mq['port'] + node.normal['rabbitmq']['ssl_port'] = bind_mq['port'] else - Chef::Log.error "Unable to listen on the port #{bind_mq.port} for RabbitMQ TCP, which is listened on by SSL!" + Chef::Log.error "Unable to listen on the port #{bind_mq['port']} for RabbitMQ TCP, which is listened on by SSL!" end else - node.normal['rabbitmq']['port'] = bind_mq.port + node.normal['rabbitmq']['port'] = bind_mq['port'] end node.normal['rabbitmq']['address'] = bind_mq_address node.normal['rabbitmq']['nodename'] = "#{user}@#{node['hostname']}" @@ -61,14 +62,6 @@ end include_recipe 'rabbitmq' include_recipe 'rabbitmq::mgmt_console' -# TODO(mrv) This could be removed once support for this is added to the rabbitmq cookbook. -# Issue: https://github.com/kennonkwok/rabbitmq/issues/136 -rabbitmq_user 'remove rabbit guest user' do - user 'guest' - action :delete - not_if { user == 'guest' } -end - rabbitmq_user 'add openstack rabbit user' do user user password pass diff --git a/spec/rabbitmq-server_spec.rb b/spec/rabbitmq-server_spec.rb index 5adb353..faee047 100644 --- a/spec/rabbitmq-server_spec.rb +++ b/spec/rabbitmq-server_spec.rb @@ -19,11 +19,11 @@ describe 'openstack-ops-messaging::rabbitmq-server' do end it 'overrides rabbit and openstack image attributes' do - node.set['openstack']['bind_service']['mq']['interface'] = 'eth0' - node.set['openstack']['bind_service']['mq']['port'] = '4242' - node.set['openstack']['endpoints']['mq']['port'] = '4242' - node.set['openstack']['mq']['user'] = 'foo' - node.set['openstack']['mq']['vhost'] = '/bar' + node.override['openstack']['bind_service']['mq']['interface'] = 'enp0s3' + node.override['openstack']['bind_service']['mq']['port'] = '4242' + node.override['openstack']['endpoints']['mq']['port'] = '4242' + node.override['openstack']['mq']['user'] = 'foo' + node.override['openstack']['mq']['vhost'] = '/bar' expect(chef_run.node['openstack']['mq']['listen']).to eq('33.44.55.66') expect(chef_run.node['openstack']['mq']['image']['rabbit']['port']).to eq('4242') expect(chef_run.node['openstack']['mq']['image']['rabbit']['userid']).to eq('foo') @@ -32,8 +32,8 @@ describe 'openstack-ops-messaging::rabbitmq-server' do describe 'rabbit ssl' do before do - node.set['openstack']['mq']['rabbitmq']['use_ssl'] = true - node.set['openstack']['bind_service']['mq']['port'] = '1234' + node.override['openstack']['mq']['rabbitmq']['use_ssl'] = true + node.override['openstack']['bind_service']['mq']['port'] = '1234' end it 'overrides rabbit ssl attributes' do @@ -45,7 +45,7 @@ describe 'openstack-ops-messaging::rabbitmq-server' do describe 'cluster' do before do - node.set['openstack']['mq'] = { + node.override['openstack']['mq'] = { 'cluster' => true, } end @@ -67,7 +67,7 @@ describe 'openstack-ops-messaging::rabbitmq-server' do end it 'does not search for cluster_disk_nodes' do - node.set['openstack']['mq']['search_for_cluster_disk_nodes'] = false + node.override['openstack']['mq']['search_for_cluster_disk_nodes'] = false expect(chef_run.node['rabbitmq']['clustering']['cluster_nodes']).to eq([]) end end @@ -78,22 +78,10 @@ describe 'openstack-ops-messaging::rabbitmq-server' do end describe 'lwrps' do - context 'default mq attributes' do - it 'does delete the guest user' do - expect(chef_run).to delete_rabbitmq_user('remove rabbit guest user') - end - end - context 'custom mq attributes' do before do - node.set['openstack']['mq']['user'] = 'not-a-guest' - node.set['openstack']['mq']['vhost'] = '/foo' - end - - it 'deletes the guest user' do - expect(chef_run).to delete_rabbitmq_user( - 'remove rabbit guest user' - ).with(user: 'guest') + node.override['openstack']['mq']['user'] = 'not-a-guest' + node.override['openstack']['mq']['vhost'] = '/foo' end it 'adds openstack rabbit user' do diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 2fa8b0b..b466c2c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -7,19 +7,14 @@ ChefSpec::Coverage.start! { add_filter 'openstack-ops-messaging' } LOG_LEVEL = :fatal REDHAT_OPTS = { platform: 'redhat', - version: '7.1', + version: '7.3', log_level: LOG_LEVEL, }.freeze UBUNTU_OPTS = { platform: 'ubuntu', - version: '14.04', + version: '16.04', log_level: LOG_LEVEL, }.freeze -SUSE_OPTS = { - platform: 'suse', - version: '11.3', - log_level: ::LOG_LEVEL, -}.freeze shared_context 'ops_messaging_stubs' do before do @@ -27,7 +22,7 @@ shared_context 'ops_messaging_stubs' do .with('lo') .and_return '127.0.0.1' allow_any_instance_of(Chef::Recipe).to receive(:address_for) - .with('eth0') + .with('enp0s3') .and_return '33.44.55.66' allow_any_instance_of(Chef::Recipe).to receive(:search) .with(:node, 'recipes:openstack-ops-messaging\\:\\:rabbitmq-server AND chef_environment:_default')