openstack/puppet-heat
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: Ie28adb28dba6f8fd04520b1e5deea30fa66d775b
This commit is contained in:
Takashi Kajinami 2022-02-07 00:08:43 +09:00
parent 8c660c594b
commit 6ce889d3f2
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

@ -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,

7
manifests/keystone/auth_cfn.pp
View File

@ -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,