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

Merge "Use get_secret instead of secret"

Browse Source
This commit is contained in:
Jenkins
2014-04-04 15:22:56 +00:00
committed by Gerrit Code Review
parent f088dab88b f177e019dc
commit c61e53aae8
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
recipes/identity_registration.rb
View File

@@ -27,7 +27,7 @@ class ::Chef::Recipe # rubocop:disable Documentation
end end
identity_admin_endpoint = endpoint 'identity-admin' identity_admin_endpoint = endpoint 'identity-admin'
bootstrap_token = secret 'secrets', 'openstack_identity_bootstrap_token' bootstrap_token = get_secret 'openstack_identity_bootstrap_token'
auth_uri = ::URI.decode identity_admin_endpoint.to_s auth_uri = ::URI.decode identity_admin_endpoint.to_s
cinder_api_endpoint = endpoint 'block-storage-api' cinder_api_endpoint = endpoint 'block-storage-api'
service_pass = get_password 'service', 'openstack-block-storage' service_pass = get_password 'service', 'openstack-block-storage'

2
recipes/volume.rb
View File

@@ -57,7 +57,7 @@ when 'cinder.volume.drivers.netapp.iscsi.NetAppISCSIDriver'
when 'cinder.volume.drivers.rbd.RBDDriver' when 'cinder.volume.drivers.rbd.RBDDriver'
# this is used in the cinder.conf template # this is used in the cinder.conf template
node.override['openstack']['block-storage']['rbd_secret_uuid'] = secret 'secrets', node['openstack']['block-storage']['rbd_secret_name'] node.override['openstack']['block-storage']['rbd_secret_uuid'] = get_secret node['openstack']['block-storage']['rbd_secret_name']
rbd_user = node['openstack']['block-storage']['rbd_user'] rbd_user = node['openstack']['block-storage']['rbd_user']
rbd_key = get_password 'service', node['openstack']['block-storage']['rbd_key_name'] rbd_key = get_password 'service', node['openstack']['block-storage']['rbd_key_name']

8
spec/spec_helper.rb
View File

@@ -36,11 +36,11 @@ shared_context 'block-storage-stubs' do
Chef::Recipe.any_instance.stub(:get_password) Chef::Recipe.any_instance.stub(:get_password)
.with('db', anything) .with('db', anything)
.and_return('') .and_return('')
Chef::Recipe.any_instance.stub(:secret) Chef::Recipe.any_instance.stub(:get_secret)
.with('secrets', 'openstack_identity_bootstrap_token') .with('openstack_identity_bootstrap_token')
.and_return('bootstrap-token') .and_return('bootstrap-token')
Chef::Recipe.any_instance.stub(:secret) Chef::Recipe.any_instance.stub(:get_secret)
.with('secrets', 'rbd_secret_uuid') .with('rbd_secret_uuid')
.and_return('b0ff3bba-e07b-49b1-beed-09a45552b1ad') .and_return('b0ff3bba-e07b-49b1-beed-09a45552b1ad')
Chef::Recipe.any_instance.stub(:get_password) Chef::Recipe.any_instance.stub(:get_password)
.with('user', 'guest') .with('user', 'guest')