From b5fac0e02b5f5c541c6a16fe31ab8478c521db73 Mon Sep 17 00:00:00 2001 From: Mark Vanderwiel Date: Mon, 22 Jun 2015 15:43:33 -0500 Subject: [PATCH] Replace deprecated get_secret Use get_password 'token' instead. Change-Id: I8a6a22751cfd3f262d44adaa7eb33ae0bcf9cffd Partial-Bug: #1467662 --- metadata.rb | 2 +- recipes/identity_registration.rb | 2 +- spec/spec_helper.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/metadata.rb b/metadata.rb index 6a2721b..8ae672c 100644 --- a/metadata.rb +++ b/metadata.rb @@ -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' diff --git a/recipes/identity_registration.rb b/recipes/identity_registration.rb index d2b89ad..c2d3055 100644 --- a/recipes/identity_registration.rb +++ b/recipes/identity_registration.rb @@ -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' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index ed04b37..a301465 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -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)