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

Clean up cookbook for bp/clean-up-attr-for-mq-and-db 

This change removes the attributes we'll be moving to openstack-common
and changes reference of those attributes to reflect new (more
consistent) namespace.

Change-Id: I5f324ed2494a643d27bb2922361e21f4a1ce2a1f
Implements: blueprint clean-up-attr-for-mq-and-db
This commit is contained in:
Matt Thompson 2014-01-16 16:31:40 +00:00
parent 84c491f236
commit 5eaff5f970
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
recipes/openstack-db.rb
View File

@ -23,48 +23,48 @@ end
db_create_with_user(
"compute",
node["openstack"]["compute"]["db"]["username"],
node["openstack"]["db"]["compute"]["username"],
get_password("db", "nova")
)
db_create_with_user(
"dashboard",
node["openstack"]["dashboard"]["db"]["username"],
node["openstack"]["db"]["dashboard"]["username"],
get_password("db", "horizon")
)
db_create_with_user(
"identity",
node["openstack"]["identity"]["db"]["username"],
node["openstack"]["db"]["identity"]["username"],
get_password("db", "keystone")
)
db_create_with_user(
"image",
node["openstack"]["image"]["db"]["username"],
node["openstack"]["db"]["image"]["username"],
get_password("db", "glance")
)
db_create_with_user(
"metering",
node["openstack"]["metering"]["db"]["username"],
node["openstack"]["db"]["metering"]["username"],
get_password("db", "ceilometer")
)
db_create_with_user(
"network",
node["openstack"]["network"]["db"]["username"],
node["openstack"]["db"]["network"]["username"],
get_password("db", "neutron")
)
db_create_with_user(
"volume",
node["openstack"]["block-storage"]["db"]["username"],
"block-storage",
node["openstack"]["db"]["block-storage"]["username"],
get_password("db", "cinder")
)
db_create_with_user(
"orchestration",
node["openstack"]["orchestration"]["db"]["username"],
node["openstack"]["db"]["orchestration"]["username"],
get_password("db", "heat")
)

4
spec/openstack-db_spec.rb
View File

@ -13,7 +13,7 @@ describe 'openstack-ops-database::openstack-db' do
it 'creates nova database and user' do
::Chef::Recipe.any_instance.should_receive(:db_create_with_user)
.with 'dashboard', 'dash', 'test-pass'
.with 'compute', 'nova', 'test-pass'
@chef_run.converge 'openstack-ops-database::openstack-db'
end
@ -55,7 +55,7 @@ describe 'openstack-ops-database::openstack-db' do
it 'creates volume database and user' do
::Chef::Recipe.any_instance.should_receive(:db_create_with_user)
.with 'volume', 'cinder', 'test-pass'
.with 'block-storage', 'cinder', 'test-pass'
@chef_run.converge 'openstack-ops-database::openstack-db'
end