From 6ce889d3f29c9c1c94c015d1d82ebfbb6bc90cef Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 7 Feb 2022 00:08:43 +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: Ie28adb28dba6f8fd04520b1e5deea30fa66d775b --- manifests/keystone/auth.pp | 7 +------ manifests/keystone/auth_cfn.pp | 7 +------ 2 files changed, 2 insertions(+), 12 deletions(-) diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 487f6fd0..72d04e3f 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -137,12 +137,7 @@ class heat::keystone::auth ( validate_legacy(String, 'validate_string', $password) - Keystone_user_role<| name == "${auth_name}@${tenant}" |> -> Anchor['heat::service::end'] - Keystone_user_role<| name == "${auth_name}@::::${system_scope}" |> -> Anchor['heat::service::end'] - - if $configure_endpoint { - Keystone_endpoint["${region}/${service_name}::${service_type}"] -> Anchor['heat::service::end'] - } + Keystone::Resource::Service_identity['heat'] -> Anchor['heat::service::end'] keystone::resource::service_identity { 'heat': configure_user => $configure_user, diff --git a/manifests/keystone/auth_cfn.pp b/manifests/keystone/auth_cfn.pp index 9f7a519c..090f1c8a 100644 --- a/manifests/keystone/auth_cfn.pp +++ b/manifests/keystone/auth_cfn.pp @@ -107,12 +107,7 @@ class heat::keystone::auth_cfn ( validate_legacy(String, 'validate_string', $password) - Keystone_user_role<| name == "${auth_name}@${tenant}" |> -> Anchor['heat::service::end'] - Keystone_user_role<| name == "${auth_name}@::::${system_scope}" |> -> Anchor['heat::service::end'] - - if $configure_endpoint { - Keystone_endpoint["${region}/${service_name}::${service_type}"] -> Anchor['heat::service::end'] - } + Keystone::Resource::Service_identity['heat-cfn'] -> Anchor['heat::service::end'] keystone::resource::service_identity { 'heat-cfn': configure_user => $configure_user,