From b4a725b35486dba288ade4bab4e0b6fc194bb5f6 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 7 Feb 2022 00:24:17 +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: I84ad764718f7dbd7b9c8209b2cd29bf531dff4c2 --- manifests/keystone/auth.pp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 3db5af2..01a3e9c 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -98,13 +98,7 @@ class watcher::keystone::auth ( $real_service_name = pick($service_name, $auth_name) - if $configure_user_role { - Keystone_user_role["${auth_name}@${tenant}"] ~> Anchor['watcher::service::end'] - } - - if $configure_endpoint { - Keystone_endpoint["${region}/${real_service_name}::${service_type}"] ~> Anchor['watcher::service::end'] - } + Keystone::Resource::Service_identity['watcher'] -> Anchor['watcher::service::end'] keystone::resource::service_identity { 'watcher': configure_user => $configure_user,