Browse Source

Replace deprecated get_secret

Use get_password 'token' instead.

Change-Id: I8a6a22751cfd3f262d44adaa7eb33ae0bcf9cffd
Partial-Bug: #1467662
Mark Vanderwiel 3 years ago
parent
commit
b5fac0e02b
3 changed files with 4 additions and 4 deletions
  1. 1
    1
      metadata.rb
  2. 1
    1
      recipes/identity_registration.rb
  3. 2
    2
      spec/spec_helper.rb

+ 1
- 1
metadata.rb View File

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

+ 1
- 1
recipes/identity_registration.rb View File

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

+ 2
- 2
spec/spec_helper.rb View File

@@ -30,8 +30,8 @@ shared_context 'orchestration_stubs' do
30 30
     allow_any_instance_of(Chef::Recipe).to receive(:address_for)
31 31
       .with('lo')
32 32
       .and_return '127.0.1.1'
33
-    allow_any_instance_of(Chef::Recipe).to receive(:get_secret)
34
-      .with('openstack_identity_bootstrap_token')
33
+    allow_any_instance_of(Chef::Recipe).to receive(:get_password)
34
+      .with('token', 'openstack_identity_bootstrap_token')
35 35
       .and_return 'bootstrap-token'
36 36
 
37 37
     allow_any_instance_of(Chef::Recipe).to receive(:get_password)

Loading…
Cancel
Save