From c91040aad94818b8101d806cd8c7e321dafaa896 Mon Sep 17 00:00:00 2001 From: Jeremy Liu Date: Fri, 14 Jul 2017 15:22:45 +0800 Subject: [PATCH] Set entry point for dogtag config correctly dogtag configurations have been moved to "plugin/dogtag_config_opts.py", also remove non-existent entry point when generating barbican.conf Closes-bug: #1704320 Change-Id: I9dd202d82797cb70051323fe949cc66f8a050022 --- etc/oslo-config-generator/barbican.conf | 1 - setup.cfg | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/etc/oslo-config-generator/barbican.conf b/etc/oslo-config-generator/barbican.conf index 466924f67..c1fb91886 100644 --- a/etc/oslo-config-generator/barbican.conf +++ b/etc/oslo-config-generator/barbican.conf @@ -1,6 +1,5 @@ [DEFAULT] output_file = etc/barbican/barbican.conf.sample -namespace = barbican namespace = barbican.certificate.plugin namespace = barbican.certificate.plugin.snakeoil namespace = barbican.common.config diff --git a/setup.cfg b/setup.cfg index d0f81c52f..1c2e77079 100644 --- a/setup.cfg +++ b/setup.cfg @@ -61,7 +61,7 @@ oslo.config.opts = barbican.plugin.secret_store = barbican.plugin.interface.secret_store:list_opts barbican.plugin.crypto = barbican.plugin.crypto.manager:list_opts barbican.plugin.crypto.simple = barbican.plugin.crypto.simple_crypto:list_opts - barbican.plugin.dogtag_config_opts = barbican.plugin.dogtag:list_opts + barbican.plugin.dogtag = barbican.plugin.dogtag_config_opts:list_opts barbican.plugin.crypto.p11 = barbican.plugin.crypto.p11_crypto:list_opts barbican.plugin.secret_store.kmip = barbican.plugin.kmip_secret_store:list_opts barbican.certificate.plugin = barbican.plugin.interface.certificate_manager:list_opts