Replace deprecated get_secret

Use get_password 'token' instead.

Change-Id: I8a6a22751cfd3f262d44adaa7eb33ae0bcf9cffd
Partial-Bug: #1467662
This commit is contained in:
Mark Vanderwiel 2015-06-22 15:43:33 -05:00
parent 2a0e5aadb0
commit b5fac0e02b
3 changed files with 4 additions and 4 deletions

View File

@ -18,5 +18,5 @@ recipe 'openstack-orchestration::identity_registration', 'Registers Heat service
supports os
end
depends 'openstack-common', '>= 11.4.0'
depends 'openstack-common', '>= 11.5.0'
depends 'openstack-identity', '>= 11.0.0'

View File

@ -26,7 +26,7 @@ end
identity_admin_endpoint = admin_endpoint 'identity-admin'
token = get_secret 'openstack_identity_bootstrap_token'
token = get_password 'token', 'openstack_identity_bootstrap_token'
auth_url = ::URI.decode identity_admin_endpoint.to_s
admin_heat_endpoint = admin_endpoint 'orchestration-api'

View File

@ -30,8 +30,8 @@ shared_context 'orchestration_stubs' do
allow_any_instance_of(Chef::Recipe).to receive(:address_for)
.with('lo')
.and_return '127.0.1.1'
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_password)