Replace deprecated get_secret

Use get_password 'token' instead.

Change-Id: I9c2160bc329e6ee8f562b1a334dc6b5d2cf2eed4
Partial-Bug: #1467662
This commit is contained in:
Mark Vanderwiel 2015-06-22 15:38:21 -05:00
parent b42a8d44dd
commit fece8b5af2
3 changed files with 4 additions and 4 deletions

View File

@ -11,7 +11,7 @@ recipe 'openstack-integration-test::setup', 'Installs and configures Tempest'
supports os
end
depends 'openstack-common', '>= 11.0.0'
depends 'openstack-common', '>= 11.5.0'
depends 'openstack-identity', '>= 11.0.0'
depends 'openstack-image', '>= 11.0.0'
depends 'openstack-compute', '>= 11.0.0'

View File

@ -39,7 +39,7 @@ identity_admin_endpoint = admin_endpoint 'identity-admin'
# Since this is testing things from the user's perspective,
# use the public identity endpoint
identity_api_endpoint = public_endpoint 'identity-api'
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_pass = get_password 'user', node['openstack']['identity']['admin_user']

View File

@ -28,8 +28,8 @@ shared_context 'tempest-stubs' do
'OS_AUTH_URL' => 'http://127.0.0.1:35357/v2.0'
}
Chef::Recipe.any_instance.stub(:get_secret)
.with('openstack_identity_bootstrap_token')
Chef::Recipe.any_instance.stub(:get_password)
.with('token', 'openstack_identity_bootstrap_token')
.and_return('bootstrap-token')
Chef::Recipe.any_instance.stub(:get_password)
.with('user', 'admin')