openstack
/
cookbook-openstack-ops-messaging
Code Issues Proposed changes

Removed attributes now handled by `openstack-common` 

Now that `openstack-common` handles the `["openstack"]["mq"]`
attributes, there is no need to set them in the default test cases.

Change-Id: I1987a6c4ae0898bcf2cd0100fd1f5408990f2592
This commit is contained in:
John Dewey 2013-07-03 11:04:31 -07:00
parent c4bcd7ee7b
commit e901580a79
4 changed files with 20 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Berksfile.lock
View File

@ -1,25 +1,25 @@
{
"sha": "db43c403a1eba40c4c3e7833bc8586191ed34ac7",
"sha": "45e1bf81e0dd550088ee5794e167786e616570ea",
"sources": {
"openstack-ops-messaging": {
"path": "."
},
"openstack-common": {
"locked_version": "0.2.2",
"locked_version": "0.3.0",
"git": "git://github.com/stackforge/cookbook-openstack-common.git",
"ref": "0c771cfab3147489e7dffcf9b9b067f2aa9d0f8b"
"ref": "25b183f2362fa501cfee4db331491b3d984a5c05"
},
"rabbitmq": {
"locked_version": "2.1.0"
"locked_version": "2.1.2"
},
"erlang": {
"locked_version": "1.3.0"
},
"apt": {
"locked_version": "1.10.0"
"locked_version": "2.0.0"
},
"yum": {
"locked_version": "2.2.2"
"locked_version": "2.3.0"
},
"build-essential": {
"locked_version": "1.4.0"
@ -28,16 +28,16 @@
"locked_version": "1.4.0"
},
"mysql": {
"locked_version": "3.0.0"
"locked_version": "3.0.2"
},
"openssl": {
"locked_version": "1.0.2"
},
"postgresql": {
"locked_version": "3.0.0"
"locked_version": "3.0.2"
},
"aws": {
"locked_version": "0.101.0"
"locked_version": "0.101.2"
},
"xfs": {
"locked_version": "1.1.0"

4
attributes/default.rb
View File

@ -19,7 +19,3 @@
default["openstack"]["mq"]["bind_interface"] = "lo"
default["openstack"]["mq"]["cluster"] = false
# TODO(retr0h): Delete when these attributes are merged into openstack-common
default["openstack"]["mq"]["server_role"] = "os-ops-messaging"
default["openstack"]["mq"]["service_type"] = "rabbitmq"
default["openstack"]["mq"]["port"] = "5672"

38
spec/rabbitmq-server_spec.rb
View File

@ -4,12 +4,7 @@ describe "openstack-ops-messaging::rabbitmq-server" do
before { ops_messaging_stubs }
describe "ubuntu" do
before do
@chef_run = ::ChefSpec::ChefRunner.new(::UBUNTU_OPTS) do |n|
n.set["openstack"]["mq"] = {
"user" => "rabbit-user",
"vhost" => "/test-vhost"
}
end
@chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
@chef_run.converge "openstack-ops-messaging::rabbitmq-server"
end
@ -17,7 +12,7 @@ describe "openstack-ops-messaging::rabbitmq-server" do
expect(@chef_run.node["openstack"]["mq"]["port"]).to eql "5672"
expect(@chef_run.node["openstack"]["mq"]["listen"]).to eql "127.0.0.1"
expect(@chef_run.node["rabbitmq"]["address"]).to eql "127.0.0.1"
expect(@chef_run.node["rabbitmq"]["default_user"]).to eql "rabbit-user"
expect(@chef_run.node["rabbitmq"]["default_user"]).to eql "guest"
expect(@chef_run.node['rabbitmq']['default_pass']).to eql "rabbit-pass"
end
@ -25,7 +20,6 @@ describe "openstack-ops-messaging::rabbitmq-server" do
before do
@chef_run = ::ChefSpec::ChefRunner.new(::UBUNTU_OPTS) do |n|
n.set["openstack"]["mq"] = {
"user" => "rabbit-user",
"cluster" => true
}
end
@ -44,7 +38,7 @@ describe "openstack-ops-messaging::rabbitmq-server" do
it "overrides cluster_disk_nodes" do
expect(@chef_run.node['rabbitmq']['cluster_disk_nodes']).to eql(
["rabbit-user@host1", "rabbit-user@host2"]
["guest@host1", "guest@host2"]
)
end
end
@ -69,12 +63,7 @@ describe "openstack-ops-messaging::rabbitmq-server" do
it "doesn't delete guest user" do
opts = ::UBUNTU_OPTS.merge(:evaluate_guards => true)
chef_run = ::ChefSpec::ChefRunner.new(opts) do |n|
n.set["openstack"]["mq"] = {
"user" => "guest",
"vhost" => "/test-vhost"
}
end
chef_run = ::ChefSpec::ChefRunner.new opts
chef_run.converge "openstack-ops-messaging::rabbitmq-server"
resource = chef_run.find_resource(
@ -92,7 +81,7 @@ describe "openstack-ops-messaging::rabbitmq-server" do
).to_hash
expect(resource).to include(
:user => "rabbit-user",
:user => "guest",
:password => "rabbit-pass",
:action => [:add]
)
@ -105,7 +94,7 @@ describe "openstack-ops-messaging::rabbitmq-server" do
).to_hash
expect(resource).to include(
:vhost => "/test-vhost",
:vhost => "/",
:action => [:add]
)
end
@ -117,8 +106,8 @@ describe "openstack-ops-messaging::rabbitmq-server" do
).to_hash
expect(resource).to include(
:user => "rabbit-user",
:vhost => "/test-vhost",
:user => "guest",
:vhost => "/",
:permissions => '.* .* .*',
:action => [:set_permissions]
)
@ -131,7 +120,7 @@ describe "openstack-ops-messaging::rabbitmq-server" do
).to_hash
expect(resource).to include(
:user => "rabbit-user",
:user => "guest",
:tag => "administrator",
:action => [:set_tags]
)
@ -150,12 +139,7 @@ describe "openstack-ops-messaging::rabbitmq-server" do
it "doesn't reset the database" do
opts = ::UBUNTU_OPTS.merge(:evaluate_guards => true)
chef_run = ::ChefSpec::ChefRunner.new opts do |n|
n.set["openstack"]["mq"] = {
"user" => "rabbit-user",
"vhost" => "/test-vhost"
}
end
chef_run = ::ChefSpec::ChefRunner.new opts
chef_run.converge "openstack-ops-messaging::rabbitmq-server"
expect(chef_run).not_to execute_command(@cmd)
@ -167,8 +151,6 @@ describe "openstack-ops-messaging::rabbitmq-server" do
opts = ::UBUNTU_OPTS.merge(:evaluate_guards => true)
@chef_run = ::ChefSpec::ChefRunner.new opts do |n|
n.set["openstack"]["mq"] = {
"user" => "rabbit-user",
"vhost" => "/test-vhost",
"cluster" => true
}
end

7
spec/server_spec.rb
View File

@ -5,12 +5,7 @@ describe "openstack-ops-messaging::server" do
describe "ubuntu" do
it "uses proper messaging server recipe" do
chef_run = ::ChefSpec::ChefRunner.new(::UBUNTU_OPTS) do |n|
n.set["openstack"]["mq"] = {
"user" => "rabbit-user",
"vhost" => "/test-vhost"
}
end
chef_run = ::ChefSpec::ChefRunner.new ::UBUNTU_OPTS
chef_run.converge "openstack-ops-messaging::server"
expect(chef_run).to include_recipe "openstack-ops-messaging::rabbitmq-server"