From de672ed967f1254ee0a950808911b373e53bb26a Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 27 Sep 2021 22:14:41 +0900 Subject: [PATCH] Make usage of keystone::resource::service_identity consistent 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 --- manifests/keystone/auth_inspector.pp | 5 +++-- spec/classes/ironic_keystone_auth_inspector_spec.rb | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/manifests/keystone/auth_inspector.pp b/manifests/keystone/auth_inspector.pp index 6a1006ac..1e54402b 100644 --- a/manifests/keystone/auth_inspector.pp +++ b/manifests/keystone/auth_inspector.pp @@ -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, diff --git a/spec/classes/ironic_keystone_auth_inspector_spec.rb b/spec/classes/ironic_keystone_auth_inspector_spec.rb index 16a46a26..6ed916fb 100644 --- a/spec/classes/ironic_keystone_auth_inspector_spec.rb +++ b/spec/classes/ironic_keystone_auth_inspector_spec.rb @@ -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',