openstack
/
puppet-swift
Code Issues Proposed changes

Loose dependencies about keystone endpoints 

Keystone endpoints are not strictly required to start up swift
services. This change looses the current dependencies and defer
endpoint creations, to avoid circular dependencies when we make any
resource dependent on swift services.

Depends-on: https://review.opendev.org/825984
Change-Id: I2e6ced4eb6f190ec67013f3230abeb30df74cc38
This commit is contained in:
Takashi Kajinami 2021-11-24 18:32:58 +09:00
parent c465f59e01
commit 2e34d0ce44
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
manifests/keystone/auth.pp
View File

@ -134,13 +134,11 @@ Please set password parameter')
fail('swift::keystone::auth parameters service_name and service_name_s3 must be different.')
}
# Establish that keystone auth and endpoints are properly setup before
# managing any type of swift related service.
if $configure_endpoint {
Keystone_endpoint["${region}/${service_name}::${service_type}"] -> Swift::Service<||>
Keystone_endpoint["${region}/${service_name}::${service_type}"] -> Anchor['swift::service::end']
}
if $configure_s3_endpoint {
Keystone_endpoint["${region}/${service_name_s3}::${service_type_s3}"] -> Swift::Service<||>
Keystone_endpoint["${region}/${service_name_s3}::${service_type_s3}"] -> Anchor['swift::service::end']
}
keystone::resource::service_identity { 'swift':