openstack/puppet-ironic
Code Issues Proposed changes

Make usage of keystone::resource::service_identity consistent

Browse Source 
This fixes usage of the keystone::resource::service_identity resource
type for ironic-inspector, currently inconsistent with the other
modules.

- The resource type is generally used with a static name

- Email account is same with the service name by default, not service
  type.

Change-Id: I4023cb66aca52c43f4c6b719267657e5cc0734c7
This commit is contained in:
Takashi Kajinami 2021-09-27 22:14:41 +09:00
parent 074b7fce7c
commit de672ed967
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/keystone/auth_inspector.pp
View File

@ -81,7 +81,7 @@
class ironic::keystone::auth_inspector (
$password,
$auth_name = 'ironic-inspector',
$email = 'baremetal-introspection@localhost',
$email = 'ironic-inspector@localhost',
$tenant = 'services',
$configure_endpoint = true,
$configure_user = true,
@ -106,12 +106,13 @@ class ironic::keystone::auth_inspector (
Keystone_endpoint["${region}/${real_service_name}::${service_type}"] ~> Service <| name == 'ironic-inspector' |>
}
keystone::resource::service_identity { $auth_name:
keystone::resource::service_identity { 'ironic-inspector':
configure_user => $configure_user,
configure_user_role => $configure_user_role,
configure_endpoint => $configure_endpoint,
service_name => $real_service_name,
service_type => $service_type,
auth_name => $auth_name,
service_description => $service_description,
region => $region,
password => $password,

6
spec/classes/ironic_keystone_auth_inspector_spec.rb
View File

@ -34,10 +34,11 @@ describe 'ironic::keystone::auth_inspector' do
:configure_endpoint => true,
:service_name => 'ironic-inspector',
:service_type => 'baremetal-introspection',
:auth_name => 'ironic-inspector',
:service_description => 'Bare Metal Introspection Service',
:region => 'RegionOne',
:password => 'ironic-inspector_password',
:email => 'baremetal-introspection@localhost',
:email => 'ironic-inspector@localhost',
:tenant => 'services',
:public_url => 'http://127.0.0.1:5050',
:internal_url => 'http://127.0.0.1:5050',
@ -63,12 +64,13 @@ describe 'ironic::keystone::auth_inspector' do
:admin_url => 'http://10.10.10.12:81' }
end
it { is_expected.to contain_keystone__resource__service_identity('alt_ironic-inspector').with(
it { is_expected.to contain_keystone__resource__service_identity('ironic-inspector').with(
:configure_user => false,
:configure_user_role => false,
:configure_endpoint => false,
:service_name => 'alt_service',
:service_type => 'alt_baremetal-introspection',
:auth_name => 'alt_ironic-inspector',
:service_description => 'Alternative Bare Metal Introspection Service',
:region => 'RegionTwo',
:password => 'ironic-inspector_password',