Replace deprecated get_secret

Use get_password 'token' instead.
Depends-On: I9c60955fe4ed444b9cd70384fa8fb7829b1f0c47

Change-Id: Ie3f1a5317aabe8e35172237dab82a036c7b88de1
Partial-Bug: #1467662
This commit is contained in:
Mark Vanderwiel 2015-06-22 15:22:13 -05:00
parent 2e36ff2829
commit f3431fcd2f
3 changed files with 4 additions and 4 deletions

View File

@ -12,5 +12,5 @@ recipe 'openstack-bare-metal::default', 'Temp workaround to create ironic db wit
recipe 'openstack-bare-metal::identity_registration', 'Registers ironic service/user/endpoints in keystone'
recipe 'openstack-bare-metal::ironic-common', 'Defines the common pieces of repeated code from the other recipes'
depends 'openstack-common', '>= 11.4.0'
depends 'openstack-common', '>= 11.5.0'
depends 'openstack-identity', '>= 11.0.0'

View File

@ -25,7 +25,7 @@ class ::Chef::Recipe # rubocop:disable Documentation
end
identity_admin_endpoint = 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
ironic_api_endpoint = endpoint 'bare-metal-api'
service_pass = get_password 'service', 'openstack-bare-metal'

View File

@ -32,8 +32,8 @@ shared_context 'bare-metal-stubs' do
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
.with('user', anything)
.and_return('user_pass')
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(:rabbit_servers)
.and_return('1.1.1.1:5672,2.2.2.2:5672')