From 2e34d0ce446fd60c72577caa6866c87e8db153d8 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Wed, 24 Nov 2021 18:32:58 +0900 Subject: [PATCH] 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 --- manifests/keystone/auth.pp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 073adce0..38448f94 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -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':