Fixing up repo for stable/icehouse branch
* Adding defaultbranch to .gitreview * Removing Berksfile.lock from .gitignore * Adding updated Berksfile.lock file * Updating Gems * chef (11.12.0) * chefspec (4.0.0) * rspec (3.0.0) * Cleanup specs for 4.x Change-Id: Ibe19f03d98a54520b82fd1766c36ae9598dd1c1d Partial-Bug: 1349154
This commit is contained in:
Mark Vanderwiel
parent
891092fb2f
commit
db772edbf3
|
|
@ -4,5 +4,4 @@
|
|||
.vagrant/
|
||||
.coverage/
|
||||
*.swp
|
||||
Berksfile.lock
|
||||
Vagrantfile
|
||||
|
|
|
|||
|
|
@ -2,3 +2,4 @@
|
|||
host=review.openstack.org
|
||||
port=29418
|
||||
project=stackforge/cookbook-openstack-ops-messaging.git
|
||||
defaultbranch=stable/icehouse
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
metadata
|
||||
|
||||
cookbook "openstack-common",
|
||||
git: "git://github.com/stackforge/cookbook-openstack-common.git"
|
||||
git: "git://github.com/stackforge/cookbook-openstack-common.git",
|
||||
branch: 'stable/icehouse'
|
||||
|
|
|
|||
|
|
@ -0,0 +1,57 @@
|
|||
{
|
||||
"sources": {
|
||||
"openstack-ops-messaging": {
|
||||
"path": "."
|
||||
},
|
||||
"openstack-common": {
|
||||
"locked_version": "9.7.0",
|
||||
"git": "git://github.com/stackforge/cookbook-openstack-common.git",
|
||||
"ref": "b8633843349809e2675744f211c89bf06d249b7e"
|
||||
},
|
||||
"rabbitmq": {
|
||||
"locked_version": "3.2.2"
|
||||
},
|
||||
"erlang": {
|
||||
"locked_version": "1.5.4"
|
||||
},
|
||||
"apt": {
|
||||
"locked_version": "2.3.8"
|
||||
},
|
||||
"yum": {
|
||||
"locked_version": "3.2.0"
|
||||
},
|
||||
"yum-epel": {
|
||||
"locked_version": "0.3.6"
|
||||
},
|
||||
"yum-erlang_solutions": {
|
||||
"locked_version": "0.2.0"
|
||||
},
|
||||
"build-essential": {
|
||||
"locked_version": "1.4.4"
|
||||
},
|
||||
"database": {
|
||||
"locked_version": "2.2.0"
|
||||
},
|
||||
"mysql": {
|
||||
"locked_version": "5.3.6"
|
||||
},
|
||||
"yum-mysql-community": {
|
||||
"locked_version": "0.1.10"
|
||||
},
|
||||
"postgresql": {
|
||||
"locked_version": "3.3.4"
|
||||
},
|
||||
"openssl": {
|
||||
"locked_version": "1.1.0"
|
||||
},
|
||||
"aws": {
|
||||
"locked_version": "2.1.1"
|
||||
},
|
||||
"xfs": {
|
||||
"locked_version": "1.1.0"
|
||||
},
|
||||
"mysql-chef_gem": {
|
||||
"locked_version": "0.0.2"
|
||||
}
|
||||
}
|
||||
}
|
||||
6
Gemfile
6
Gemfile
|
|
@ -1,12 +1,12 @@
|
|||
# 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'
|
||||
|
|
|
|||
|
|
@ -0,0 +1,267 @@
|
|||
GEM
|
||||
remote: https://rubygems.org/
|
||||
specs:
|
||||
activesupport (3.2.19)
|
||||
i18n (~> 0.6, >= 0.6.4)
|
||||
multi_json (~> 1.0)
|
||||
addressable (2.3.6)
|
||||
akami (1.2.2)
|
||||
gyoku (>= 0.4.0)
|
||||
nokogiri
|
||||
ast (2.0.0)
|
||||
berkshelf (2.0.18)
|
||||
activesupport (~> 3.2.0)
|
||||
addressable (~> 2.3.4)
|
||||
buff-shell_out (~> 0.1)
|
||||
chozo (>= 0.6.1)
|
||||
faraday (~> 0.8.5)
|
||||
hashie (~> 2.0)
|
||||
minitar (~> 0.5.4)
|
||||
rbzip2 (~> 0.2.0)
|
||||
retryable (~> 1.3.3)
|
||||
ridley (~> 1.7.0)
|
||||
solve (~> 0.8.2)
|
||||
thor (~> 0.18.0)
|
||||
buff-config (0.4.0)
|
||||
buff-extensions (~> 0.3)
|
||||
varia_model (~> 0.1)
|
||||
buff-extensions (0.5.0)
|
||||
buff-ignore (1.1.1)
|
||||
buff-platform (0.1.0)
|
||||
buff-ruby_engine (0.1.0)
|
||||
buff-shell_out (0.1.1)
|
||||
buff-ruby_engine (~> 0.1.0)
|
||||
builder (3.2.2)
|
||||
celluloid (0.15.2)
|
||||
timers (~> 1.1.0)
|
||||
celluloid-io (0.15.0)
|
||||
celluloid (>= 0.15.0)
|
||||
nio4r (>= 0.5.0)
|
||||
chef (11.12.8)
|
||||
chef-zero (>= 2.0.2, < 2.1)
|
||||
diff-lcs (~> 1.2, >= 1.2.4)
|
||||
erubis (~> 2.7)
|
||||
highline (~> 1.6, >= 1.6.9)
|
||||
json (>= 1.4.4, <= 1.8.1)
|
||||
mime-types (~> 1.16)
|
||||
mixlib-authentication (~> 1.3)
|
||||
mixlib-cli (~> 1.4)
|
||||
mixlib-config (~> 2.0)
|
||||
mixlib-log (~> 1.3)
|
||||
mixlib-shellout (~> 1.4)
|
||||
net-ssh (~> 2.6)
|
||||
net-ssh-multi (~> 1.1)
|
||||
ohai (~> 7.0.4)
|
||||
pry (~> 0.9)
|
||||
rest-client (>= 1.0.4, < 1.7.0)
|
||||
yajl-ruby (~> 1.1)
|
||||
chef-zero (2.0.2)
|
||||
hashie (~> 2.0)
|
||||
json
|
||||
mixlib-log (~> 1.3)
|
||||
rack
|
||||
chefspec (4.0.1)
|
||||
chef (~> 11.12)
|
||||
fauxhai (~> 2.0)
|
||||
rspec (~> 3.0)
|
||||
chozo (0.6.1)
|
||||
activesupport (>= 3.2.0)
|
||||
hashie (>= 2.0.2)
|
||||
multi_json (>= 1.3.0)
|
||||
coderay (1.1.0)
|
||||
diff-lcs (1.2.5)
|
||||
erubis (2.7.0)
|
||||
faraday (0.8.9)
|
||||
multipart-post (~> 1.2.0)
|
||||
fauxhai (2.2.0)
|
||||
net-ssh
|
||||
ohai
|
||||
ffi (1.9.3)
|
||||
foodcritic (3.0.3)
|
||||
erubis
|
||||
gherkin (~> 2.11.7)
|
||||
nokogiri (~> 1.5.4)
|
||||
rake
|
||||
treetop (~> 1.4.10)
|
||||
yajl-ruby (~> 1.1.0)
|
||||
gherkin (2.11.8)
|
||||
multi_json (~> 1.3)
|
||||
gssapi (1.0.3)
|
||||
ffi (>= 1.0.1)
|
||||
gyoku (1.1.1)
|
||||
builder (>= 2.1.2)
|
||||
hashie (2.1.2)
|
||||
highline (1.6.21)
|
||||
httpclient (2.4.0)
|
||||
httpi (0.9.7)
|
||||
rack
|
||||
i18n (0.6.11)
|
||||
ipaddress (0.8.0)
|
||||
json (1.7.7)
|
||||
little-plugger (1.1.3)
|
||||
logging (1.8.2)
|
||||
little-plugger (>= 1.1.3)
|
||||
multi_json (>= 1.8.4)
|
||||
method_source (0.8.2)
|
||||
mime-types (1.25.1)
|
||||
minitar (0.5.4)
|
||||
mixlib-authentication (1.3.0)
|
||||
mixlib-log
|
||||
mixlib-cli (1.5.0)
|
||||
mixlib-config (2.1.0)
|
||||
mixlib-log (1.6.0)
|
||||
mixlib-shellout (1.4.0)
|
||||
multi_json (1.10.1)
|
||||
multipart-post (1.2.0)
|
||||
net-http-persistent (2.9.4)
|
||||
net-ssh (2.9.1)
|
||||
net-ssh-gateway (1.2.0)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-ssh-multi (1.2.0)
|
||||
net-ssh (>= 2.6.5)
|
||||
net-ssh-gateway (>= 1.2.0)
|
||||
nio4r (1.0.0)
|
||||
nokogiri (1.5.11)
|
||||
nori (1.1.5)
|
||||
ohai (7.0.4)
|
||||
ipaddress
|
||||
mime-types (~> 1.16)
|
||||
mixlib-cli
|
||||
mixlib-config (~> 2.0)
|
||||
mixlib-log
|
||||
mixlib-shellout (~> 1.2)
|
||||
systemu (~> 2.5.2)
|
||||
yajl-ruby
|
||||
parser (2.1.9)
|
||||
ast (>= 1.1, < 3.0)
|
||||
slop (~> 3.4, >= 3.4.5)
|
||||
polyglot (0.3.5)
|
||||
powerpack (0.0.9)
|
||||
pry (0.10.0)
|
||||
coderay (~> 1.1.0)
|
||||
method_source (~> 0.8.1)
|
||||
slop (~> 3.4)
|
||||
rack (1.5.2)
|
||||
rainbow (2.0.0)
|
||||
rake (10.3.2)
|
||||
rbzip2 (0.2.0)
|
||||
rdoc (4.1.1)
|
||||
json (~> 1.4)
|
||||
rest-client (1.6.8)
|
||||
mime-types (~> 1.16)
|
||||
rdoc (>= 2.4.2)
|
||||
retryable (1.3.5)
|
||||
ridley (1.7.1)
|
||||
addressable
|
||||
buff-config (~> 0.2)
|
||||
buff-extensions (~> 0.3)
|
||||
buff-ignore (~> 1.1)
|
||||
buff-shell_out (~> 0.1)
|
||||
celluloid (~> 0.15)
|
||||
celluloid-io (~> 0.15)
|
||||
erubis
|
||||
faraday (>= 0.8.4)
|
||||
hashie (>= 2.0.2)
|
||||
json (>= 1.7.7)
|
||||
mixlib-authentication (>= 1.3.0)
|
||||
net-http-persistent (>= 2.8)
|
||||
net-ssh
|
||||
retryable
|
||||
solve (>= 0.4.4)
|
||||
varia_model (~> 0.1)
|
||||
winrm (~> 1.1.0)
|
||||
rspec (3.0.0)
|
||||
rspec-core (~> 3.0.0)
|
||||
rspec-expectations (~> 3.0.0)
|
||||
rspec-mocks (~> 3.0.0)
|
||||
rspec-core (3.0.3)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-expectations (3.0.3)
|
||||
diff-lcs (>= 1.2.0, < 2.0)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-mocks (3.0.3)
|
||||
rspec-support (~> 3.0.0)
|
||||
rspec-support (3.0.3)
|
||||
rubocop (0.18.1)
|
||||
json (>= 1.7.7, < 2)
|
||||
parser (~> 2.1.3)
|
||||
powerpack (~> 0.0.6)
|
||||
rainbow (>= 1.99.1, < 3.0)
|
||||
rubyntlm (0.1.1)
|
||||
savon (0.9.5)
|
||||
akami (~> 1.0)
|
||||
builder (>= 2.1.2)
|
||||
gyoku (>= 0.4.0)
|
||||
httpi (~> 0.9)
|
||||
nokogiri (>= 1.4.0)
|
||||
nori (~> 1.0)
|
||||
wasabi (~> 1.0)
|
||||
slop (3.6.0)
|
||||
solve (0.8.2)
|
||||
strainer (3.4.0)
|
||||
berkshelf (>= 2.0, < 4.0)
|
||||
buff-platform (~> 0.1)
|
||||
systemu (2.5.2)
|
||||
thor (0.18.1)
|
||||
timers (1.1.0)
|
||||
treetop (1.4.15)
|
||||
polyglot
|
||||
polyglot
|
||||
polyglot
|
||||
polyglot
|
||||
polyglot
|
||||
polyglot
|
||||
polyglot
|
||||
polyglot
|
||||
polyglot
|
||||
polyglot
|
||||
polyglot
|
||||
polyglot
|
||||
polyglot
|
||||
polyglot
|
||||
polyglot
|
||||
polyglot (>= 0.3.1)
|
||||
polyglot (>= 0.3.1)
|
||||
polyglot (>= 0.3.1)
|
||||
polyglot (>= 0.3.1)
|
||||
polyglot (>= 0.3.1)
|
||||
polyglot (>= 0.3.1)
|
||||
polyglot (>= 0.3.1)
|
||||
polyglot (>= 0.3.1)
|
||||
polyglot (>= 0.3.1)
|
||||
polyglot (>= 0.3.1)
|
||||
polyglot (>= 0.3.1)
|
||||
polyglot (>= 0.3.1)
|
||||
polyglot (>= 0.3.1)
|
||||
polyglot (>= 0.3.1)
|
||||
polyglot (>= 0.3.1)
|
||||
polyglot (>= 0.3.1)
|
||||
uuidtools (2.1.4)
|
||||
varia_model (0.3.2)
|
||||
buff-extensions (~> 0.2)
|
||||
hashie (>= 2.0.2)
|
||||
wasabi (1.0.0)
|
||||
nokogiri (>= 1.4.0)
|
||||
winrm (1.1.3)
|
||||
gssapi (~> 1.0.0)
|
||||
httpclient (~> 2.2, >= 2.2.0.2)
|
||||
logging (~> 1.6, >= 1.6.1)
|
||||
nokogiri (~> 1.5)
|
||||
rubyntlm (~> 0.1.1)
|
||||
savon (= 0.9.5)
|
||||
uuidtools (~> 2.1.2)
|
||||
yajl-ruby (1.1.0)
|
||||
|
||||
PLATFORMS
|
||||
ruby
|
||||
|
||||
DEPENDENCIES
|
||||
berkshelf (~> 2.0.18)
|
||||
chef (~> 11.12.0)
|
||||
chefspec (~> 4.0.0)
|
||||
foodcritic (~> 3.0.3)
|
||||
hashie (~> 2.0)
|
||||
json (<= 1.7.7)
|
||||
rspec (~> 3.0.0)
|
||||
rubocop (~> 0.18.1)
|
||||
strainer
|
||||
|
|
@ -10,8 +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
|
||||
end
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue