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

Replace deprecated get_secret 

Use get_password 'token' instead.

Change-Id: If7b01ecaed9b51798acc53c9ea4833cb74250f62
Partial-Bug: #1467662
This commit is contained in:
Mark Vanderwiel 2015-06-22 15:26:39 -05:00
parent 2ae583205f
commit 7386afb7c0
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
metadata.rb
View File

@ -20,7 +20,7 @@ recipe 'openstack-block-storage::backup', 'Installs the cinder-backup service'
end
depends 'apt', '~> 2.6.1'
depends 'openstack-common', '>= 11.4.0'
depends 'openstack-common', '>= 11.5.0'
depends 'openstack-identity', '>= 11.0.0'
depends 'openstack-image', '>= 11.0.0'
depends 'selinux', '~> 0.9.0'

2
recipes/cinder-common.rb
View File

@ -57,7 +57,7 @@ when 'cinder.volume.drivers.ibm.flashsystem.FlashSystemDriver'
when 'cinder.volume.drivers.ibm.ibmnas.IBMNAS_NFSDriver'
ibmnas_pass = get_password 'user', node['openstack']['block-storage']['ibmnas']['nas_login']
when 'cinder.volume.drivers.vmware.vmdk.VMwareVcVmdkDriver'
vmware_host_pass = get_secret node['openstack']['block-storage']['vmware']['secret_name']
vmware_host_pass = get_password 'token', node['openstack']['block-storage']['vmware']['secret_name']
end
glance_api_endpoint = internal_endpoint 'image-api'

2
recipes/identity_registration.rb
View File

@ -27,7 +27,7 @@ class ::Chef::Recipe # rubocop:disable Documentation
end
identity_admin_endpoint = admin_endpoint 'identity-admin'
bootstrap_token = get_secret 'openstack_identity_bootstrap_token'
bootstrap_token = get_password 'token', 'openstack_identity_bootstrap_token'
auth_uri = ::URI.decode identity_admin_endpoint.to_s
admin_cinder_api_endpoint = admin_endpoint 'block-storage-api'
internal_cinder_api_endpoint = internal_endpoint 'block-storage-api'

12
spec/spec_helper.rb
View File

@ -36,14 +36,14 @@ shared_context 'block-storage-stubs' do
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
.with('db', anything)
.and_return('')
allow_any_instance_of(Chef::Recipe).to receive(:get_secret)
.with('openstack_identity_bootstrap_token')
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
.with('token', 'openstack_identity_bootstrap_token')
.and_return('bootstrap-token')
allow_any_instance_of(Chef::Recipe).to receive(:get_secret)
.with('rbd_secret_uuid')
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
.with('token', 'rbd_secret_uuid')
.and_return('b0ff3bba-e07b-49b1-beed-09a45552b1ad')
allow_any_instance_of(Chef::Recipe).to receive(:get_secret)
.with('openstack_vmware_secret_name')
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
.with('token', 'openstack_vmware_secret_name')
.and_return 'vmware_secret_name'
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
.with('user', 'guest')