Replace deprecated get_secret
Use get_password 'token' instead. Depends-On: I9c60955fe4ed444b9cd70384fa8fb7829b1f0c47 Change-Id: Ie3f1a5317aabe8e35172237dab82a036c7b88de1 Partial-Bug: #1467662
This commit is contained in:
parent
2e36ff2829
commit
f3431fcd2f
@ -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::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'
|
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'
|
depends 'openstack-identity', '>= 11.0.0'
|
||||||
|
@ -25,7 +25,7 @@ class ::Chef::Recipe # rubocop:disable Documentation
|
|||||||
end
|
end
|
||||||
|
|
||||||
identity_admin_endpoint = endpoint 'identity-admin'
|
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
|
auth_uri = ::URI.decode identity_admin_endpoint.to_s
|
||||||
ironic_api_endpoint = endpoint 'bare-metal-api'
|
ironic_api_endpoint = endpoint 'bare-metal-api'
|
||||||
service_pass = get_password 'service', 'openstack-bare-metal'
|
service_pass = get_password 'service', 'openstack-bare-metal'
|
||||||
|
@ -32,8 +32,8 @@ shared_context 'bare-metal-stubs' do
|
|||||||
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
|
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
|
||||||
.with('user', anything)
|
.with('user', anything)
|
||||||
.and_return('user_pass')
|
.and_return('user_pass')
|
||||||
allow_any_instance_of(Chef::Recipe).to receive(:get_secret)
|
allow_any_instance_of(Chef::Recipe).to receive(:get_password)
|
||||||
.with('openstack_identity_bootstrap_token')
|
.with('token', 'openstack_identity_bootstrap_token')
|
||||||
.and_return('bootstrap-token')
|
.and_return('bootstrap-token')
|
||||||
allow_any_instance_of(Chef::Recipe).to receive(:rabbit_servers)
|
allow_any_instance_of(Chef::Recipe).to receive(:rabbit_servers)
|
||||||
.and_return('1.1.1.1:5672,2.2.2.2:5672')
|
.and_return('1.1.1.1:5672,2.2.2.2:5672')
|
||||||
|
Loading…
Reference in New Issue
Block a user