openstack/puppet-ironic
Code Issues Proposed changes

Simplify definition to ensure keystone resource creation

Browse Source 
Use the whole resource type instead of its individual resources, to
rely on interface instead of implementation of the dependent module.

Change-Id: I036ad287761fa6c4361a45e8d2d9711509a1ade9
This commit is contained in:
Takashi Kajinami 2022-02-07 00:10:37 +09:00
parent 815d8ea913
commit 9f34e8b03e
2 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
manifests/keystone/auth.pp
View File

@ -121,12 +121,7 @@ class ironic::keystone::auth (
include ironic::deps
Keystone_user_role<| name == "${auth_name}@${tenant}" |> -> Anchor['ironic::service::end']
Keystone_user_role<| name == "${auth_name}@::::${system_scope}" |> -> Anchor['ironic::service::end']
if $configure_endpoint {
Keystone_endpoint["${region}/${service_name}::${service_type}"] -> Anchor['ironic::service::end']
}
Keystone::Resource::Service_identity['ironic'] -> Anchor['ironic::service::end']
keystone::resource::service_identity { 'ironic':
configure_user => $configure_user,

7
manifests/keystone/auth_inspector.pp
View File

@ -114,12 +114,7 @@ class ironic::keystone::auth_inspector (
$real_service_name = pick($service_name, $auth_name)
Keystone_user_role<| name == "${auth_name}@${tenant}" |> ~> Service <| name == 'ironic-inspector' |>
Keystone_user_role<| name == "${auth_name}@::::${system_scope}" |> ~> Service <| name == 'ironic-inspector' |>
if $configure_endpoint {
Keystone_endpoint["${region}/${real_service_name}::${service_type}"] ~> Service <| name == 'ironic-inspector' |>
}
Keystone::Resource::Service_identity['ironic-inspector'] -> Service <| name == 'ironic-inspector' |>
keystone::resource::service_identity { 'ironic-inspector':
configure_user => $configure_user,