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

Make `#service_password` consistent 

Needed to make `#service_password` consistent with api.rb.

Change-Id: I47c4fabf4e421b996e877b595d2f0ff719319cba
This commit is contained in:
John Dewey 2013-07-24 15:31:34 -07:00
parent 1a704f550c
commit 66c693c90a
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
recipes/identity_registration.rb
View File

@ -29,7 +29,7 @@ identity_admin_endpoint = endpoint "identity-admin"
bootstrap_token = secret "secrets", "openstack_identity_bootstrap_token"
auth_uri = ::URI.decode identity_admin_endpoint.to_s
cinder_api_endpoint = endpoint "volume-api"
service_pass = service_password "cinder"
service_pass = service_password "openstack-block-storage"
region = node["openstack"]["block-storage"]["region"]
service_tenant_name = node["openstack"]["block-storage"]["service_tenant_name"]
service_user = node["openstack"]["block-storage"]["service_user"]

3
spec/spec_helper.rb
View File

@ -29,7 +29,8 @@ def block_storage_stubs
with("guest").
and_return "rabbit-pass"
::Chef::Recipe.any_instance.stub(:service_password).and_return String.new
::Chef::Recipe.any_instance.stub(:service_password).with("cinder").
::Chef::Recipe.any_instance.stub(:service_password).
with("openstack-block-storage").
and_return "cinder-pass"
end