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: I67aa61335f635e5cdc3176616d55f6e6002064fa
This commit is contained in:
Takashi Kajinami
2022-02-06 23:58:40 +09:00
parent c7dabe6d1e
commit d47a0d7bfb
2 changed files with 2 additions and 10 deletions

View File

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

View File

@@ -91,10 +91,7 @@ class nova::metadata::novajoin::auth(
$configure_user_role = true,
) {
if $configure_endpoint {
Keystone_endpoint["${region}/${service_name}::${service_type}"] ~> Service <| name == 'novajoin-server' |>
Keystone_endpoint["${region}/${service_name}::${service_type}"] ~> Service <| name == 'novajoin-notify' |>
}
Keystone::Resource::Service_identity['novajoin'] -> Service <| name == 'novajoin-server' |>
keystone::resource::service_identity { 'novajoin':
configure_user => $configure_user,