openstack/cookbook-openstack-block-storage
Code Issues Proposed changes

Cookbook defines rabbit settings

Browse Source 
When setting a coobook's default attributes from the attributes
of another cookbook, it becomes impossible to override from
a wrapper cookbook.  We just started working on wrapper cookbooks,
and attempting to override `openstack["mq"]` settings proved
unsuccessful.

Since the community actively has people looking into wrapper
cookbooks, this fix seems reasonable.

Change-Id: Ibadc4bddd1bc66638cd826f5bc6e3f6ee3a38179
This commit is contained in:
John Dewey
2013-07-20 12:51:00 -07:00
parent 8034ca4b94
commit 39d04a4300
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
attributes/default.rb
View File

@@ -42,7 +42,7 @@ default["openstack"]["block-storage"]["region"] = "RegionOne"
# The name of the Chef role that knows about the message queue server # The name of the Chef role that knows about the message queue server
# that Cinder uses # that Cinder uses
default["openstack"]["block-storage"]["rabbit_server_chef_role"] = node["openstack"]["mq"]["server_role"] default["openstack"]["block-storage"]["rabbit_server_chef_role"] = "os-ops-messaging"
# This is the name of the Chef role that will install the Keystone Service API # This is the name of the Chef role that will install the Keystone Service API
default["openstack"]["block-storage"]["keystone_service_chef_role"] = "keystone" default["openstack"]["block-storage"]["keystone_service_chef_role"] = "keystone"
@@ -73,10 +73,10 @@ default["openstack"]["block-storage"]["quota_driver"] = "cinder.quota.DbQuotaDri
# and accessed with openstack-common cookbook library's # and accessed with openstack-common cookbook library's
# user_password routine. You are expected to create # user_password routine. You are expected to create
# the user, pass, vhost in a wrapper rabbitmq cookbook. # the user, pass, vhost in a wrapper rabbitmq cookbook.
default["openstack"]["block-storage"]["rabbit"]["username"] = node["openstack"]["mq"]["user"] default["openstack"]["block-storage"]["rabbit"]["username"] = "guest"
default["openstack"]["block-storage"]["rabbit"]["vhost"] = node["openstack"]["mq"]["vhost"] default["openstack"]["block-storage"]["rabbit"]["vhost"] = "/"
default["openstack"]["block-storage"]["rabbit"]["port"] = node["openstack"]["mq"]["port"] default["openstack"]["block-storage"]["rabbit"]["port"] = 5672
default["openstack"]["block-storage"]["rabbit"]["host"] = node["openstack"]["mq"]["host"] default["openstack"]["block-storage"]["rabbit"]["host"] = "127.0.0.1"
default["openstack"]["block-storage"]["rabbit"]["ha"] = false default["openstack"]["block-storage"]["rabbit"]["ha"] = false
default["openstack"]["block-storage"]["db"]["username"] = "cinder" default["openstack"]["block-storage"]["db"]["username"] = "cinder"