From 072bdc5edf53d8cead3fcd739ae36b789c23fa61 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Fri, 9 Nov 2018 14:35:39 +0100 Subject: [PATCH] Change default keymaster api_class to 'barbican' There's a stevedore entry point for the barbican class, so it resolves to the Python class castellan.key_manager.barbican_key_manager.BarbicanKeyManager. Using the entry point removes a Stevedore warning in the logs. Change-Id: I8d5ca649987b0058b7a9f2483057d463f97fcbad --- manifests/keymaster.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/keymaster.pp b/manifests/keymaster.pp index a7f89a9c..0d78b935 100644 --- a/manifests/keymaster.pp +++ b/manifests/keymaster.pp @@ -5,7 +5,7 @@ # [*api_class*] # (Required) String. The api_class tells Castellan which key manager to # use to access the external key management system. The default value that -# accesses Barbican is +# accesses Barbican is 'barbican', which resolve to # castellan.key_manager.barbican_key_manager.BarbicanKeyManager. # # [*key_id*] @@ -66,7 +66,7 @@ # class swift::keymaster( - $api_class = 'castellan.key_manager.barbican_key_manager.BarbicanKeyManager', + $api_class = 'barbican', $key_id = undef, $username = 'swift', $password = undef,