From 0d140a32bd9a4680b48814ef4a8cf7b24e17232f Mon Sep 17 00:00:00 2001 From: Dmytro Dovbii Date: Wed, 2 Mar 2016 15:14:30 +0200 Subject: [PATCH] Fix the entry point for oslo-config generator When we use `tox -egenconfig`, murano configuration file is generated incorrectly. Some options in `[keystone_authtoken]` section are missed. This is because keystonemiddleware now use another function for oslo_config sample generation [1]. This function now returns a smaller list of options than before without number of deprecated options and some options required by murano. This patch changes entrypoint for oslo-config-generator in order to use older keystonemiddleware's function which lists all neccesary options 1. https://review.openstack.org/#/c/267277/ Change-Id: I61b9c102e0e07e382237f2d09206df85322cc699 Closes-Bug: #1552226 --- etc/oslo-config-generator/murano.conf | 2 +- setup.cfg | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/etc/oslo-config-generator/murano.conf b/etc/oslo-config-generator/murano.conf index 908441e8..b4fff6b1 100644 --- a/etc/oslo-config-generator/murano.conf +++ b/etc/oslo-config-generator/murano.conf @@ -1,6 +1,6 @@ [DEFAULT] output_file = etc/murano/murano.conf.sample -namespace = keystonemiddleware.auth_token +namespace = keystone_authtoken namespace = murano namespace = oslo.db namespace = oslo.log diff --git a/setup.cfg b/setup.cfg index ddb90b46..4a2f8dc8 100644 --- a/setup.cfg +++ b/setup.cfg @@ -49,6 +49,7 @@ console_scripts = murano-cfapi = murano.cmd.cfapi:main oslo.config.opts = murano = murano.opts:list_opts + keystone_authtoken = keystonemiddleware.opts:list_auth_token_opts tempest.test_plugins = murano_tests = murano_tempest_tests.plugin:MuranoTempestPlugin