From 9f34e8b03e1f8d5bdc97f30f27e4b86f9f136b4e Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 7 Feb 2022 00:10:37 +0900 Subject: [PATCH] Simplify definition to ensure keystone resource creation Use the whole resource type instead of its individual resources, to rely on interface instead of implementation of the dependent module. Change-Id: I036ad287761fa6c4361a45e8d2d9711509a1ade9 --- manifests/keystone/auth.pp | 7 +------ manifests/keystone/auth_inspector.pp | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 2423d7c7..3949339c 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -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, diff --git a/manifests/keystone/auth_inspector.pp b/manifests/keystone/auth_inspector.pp index e09754be..77821d5d 100644 --- a/manifests/keystone/auth_inspector.pp +++ b/manifests/keystone/auth_inspector.pp @@ -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,