Setting up repo for master Juno branch

* Update metadata versions
* Updates for icehouse specific attributes
* Removing Strainer file
* Updating Gems
  * chef (11.12.0)
  * chefspec (4.0.0)
  * rspec (3.0.0)
* Cleanup specs for 4.x

Change-Id: Ibb18b6a2a523c123ffd96f14cc81d958a308b313
Partial-Bug: 1349865
This commit is contained in:
Mark Vanderwiel 2014-07-29 11:51:48 -05:00
parent 891092fb2f
commit ae3c6a862f
9 changed files with 18 additions and 20 deletions

1
.gitignore vendored
View File

@ -5,4 +5,5 @@
.coverage/
*.swp
Berksfile.lock
Gemfile.lock
Vagrantfile

View File

@ -2,6 +2,9 @@
This file is used to list changes made in each version of cookbook-openstack-ops-messaging.
## 10.0.0
* Upgrading to Juno
## 9.0.1
### Bug
* Fix the depends cookbook version issue in metadata.rb

View File

@ -1,12 +1,11 @@
# encoding: UTF-8
source 'https://rubygems.org'
gem 'chef', '~> 11.8'
gem 'chef', '~> 11.12.0'
gem 'json', '<= 1.7.7' # chef 11 dependency
gem 'berkshelf', '~> 2.0.18'
gem 'hashie', '~> 2.0'
gem 'chefspec', '~> 3.4.0'
gem 'rspec', '~> 2.14.1'
gem 'chefspec', '~> 4.0.0'
gem 'rspec', '~> 3.0.0'
gem 'foodcritic', '~> 3.0.3'
gem 'strainer'
gem 'rubocop', '~> 0.18.1'

View File

@ -1,6 +1,6 @@
# Description #
This cookbook provides shared message queue configuration for the OpenStack **Icehouse** reference deployment provided by Chef for OpenStack. The http://github.com/mattray/chef-openstack-repo contains documentation for using this cookbook in the context of a full OpenStack deployment. It currently supports RabbitMQ and will soon other queues.
This cookbook provides shared message queue configuration for the OpenStack deployment provided by Chef for OpenStack. The http://github.com/mattray/chef-openstack-repo contains documentation for using this cookbook in the context of a full OpenStack deployment. It currently supports RabbitMQ and will soon other queues.
# Requirements #

View File

@ -1,5 +0,0 @@
# Strainerfile
rubocop: rubocop $SANDBOX/$COOKBOOK
knife test: knife cookbook test $COOKBOOK
foodcritic: foodcritic -f any -t ~FC003 $SANDBOX/$COOKBOOK
chefspec: rspec --format documentation $SANDBOX/$COOKBOOK/spec

View File

@ -4,7 +4,7 @@ maintainer 'Chef Software, Inc.'
maintainer_email 'matt@getchef.com'
license 'Apache 2.0'
description 'Provides the shared messaging configuration for Chef for OpenStack.'
version '9.0.1'
version '10.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', '~> 9.0'
depends 'openstack-common', '~> 10.0'
depends 'rabbitmq', '>= 3.0.4'

View File

@ -10,7 +10,7 @@ describe 'openstack-ops-messaging::rabbitmq-server' do
include_context 'ops_messaging_stubs'
it 'does not set use_distro_version to true' do
expect(chef_run.node['rabbitmq']['use_distro_version']).to be_false
expect(chef_run.node['rabbitmq']['use_distro_version']).to_not be_truthy
end
end

View File

@ -15,7 +15,7 @@ describe 'openstack-ops-messaging::rabbitmq-server' do
expect(chef_run.node['rabbitmq']['address']).to eq('127.0.0.1')
expect(chef_run.node['rabbitmq']['default_user']).to eq('guest')
expect(chef_run.node['rabbitmq']['default_pass']).to eq('rabbit-pass')
expect(chef_run.node['rabbitmq']['use_distro_version']).to be_true
expect(chef_run.node['rabbitmq']['use_distro_version']).to be_truthy
end
it 'overrides rabbit and openstack image attributes' do
@ -41,7 +41,7 @@ describe 'openstack-ops-messaging::rabbitmq-server' do
end
it 'overrides cluster' do
expect(chef_run.node['rabbitmq']['cluster']).to be_true
expect(chef_run.node['rabbitmq']['cluster']).to be_truthy
end
it 'overrides erlang_cookie' do

View File

@ -23,22 +23,22 @@ SUSE_OPTS = {
shared_context 'ops_messaging_stubs' do
before do
Chef::Recipe.any_instance.stub(:address_for)
allow_any_instance_of(Chef::Recipe).to receive(:address_for)
.with('lo')
.and_return '127.0.0.1'
Chef::Recipe.any_instance.stub(:address_for)
allow_any_instance_of(Chef::Recipe).to receive(:address_for)
.with('eth0')
.and_return '33.44.55.66'
Chef::Recipe.any_instance.stub(:search)
allow_any_instance_of(Chef::Recipe).to receive(:search)
.with(:node, 'roles:os-ops-messaging AND chef_environment:_default')
.and_return [
{ 'hostname' => 'host2' },
{ 'hostname' => 'host1' }
]
Chef::Recipe.any_instance.stub(:get_password)
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
.with('user', anything)
.and_return 'rabbit-pass'
Chef::Recipe.any_instance.stub(:get_password)
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
.with('service', 'rabbit_cookie')
.and_return 'erlang-cookie'
end