openstack
/
puppet-ironic
Code Issues Proposed changes

Merge "Skip dependency on keystone endpoint of endpoint is not configured"

This commit is contained in:
Zuul 2021-09-28 10:31:04 +00:00 committed by Gerrit Code Review
parent affcb980a9 827d3fe148
commit ba39bf3d9c
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
manifests/keystone/auth.pp
View File

@ -114,8 +114,9 @@ class ironic::keystone::auth (
if $configure_user_role {
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'ironic-server' |>
}
Keystone_endpoint["${region}/${service_name}::${service_type}"] ~> Service <| name == 'ironic-server' |>
if $configure_endpoint {
Keystone_endpoint["${region}/${service_name}::${service_type}"] ~> Service <| name == 'ironic-server' |>
}
keystone::resource::service_identity { 'ironic':
configure_user => $configure_user,

5
manifests/keystone/auth_inspector.pp
View File

@ -102,8 +102,9 @@ class ironic::keystone::auth_inspector (
if $configure_user_role {
Keystone_user_role["${auth_name}@${tenant}"] ~> Service <| name == 'ironic-inspector' |>
}
Keystone_endpoint["${region}/${real_service_name}::${service_type}"] ~> Service <| name == 'ironic-inspector' |>
if $configure_endpoint {
Keystone_endpoint["${region}/${real_service_name}::${service_type}"] ~> Service <| name == 'ironic-inspector' |>
}
keystone::resource::service_identity { $auth_name:
configure_user => $configure_user,