From 1b07c0be96c7de0e7e9722482404726c577b0f4f Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Wed, 22 Mar 2017 15:29:54 +0000 Subject: [PATCH] Fix sahara build The Ocata release of sahara appears to require manual initialization of a plugin manager. It is also necessary to exclude a module that requires an external dependency. Change-Id: I76724f68623b625f1a37b06e5279dd583753abe7 --- tools/autogenerate-config-flagmappings/hooks.py | 7 +++++++ tools/autogenerate-config-flagmappings/ignore.list | 2 ++ 2 files changed, 9 insertions(+) diff --git a/tools/autogenerate-config-flagmappings/hooks.py b/tools/autogenerate-config-flagmappings/hooks.py index 372ac9f478..05d0175e13 100644 --- a/tools/autogenerate-config-flagmappings/hooks.py +++ b/tools/autogenerate-config-flagmappings/hooks.py @@ -73,6 +73,12 @@ def nova_spice(): import nova.cmd.spicehtml5proxy # noqa +def sahara_init(): + from sahara.plugins import base as plugins_base + + plugins_base.setup_plugins() + + def zaqar_config(): # Zaqar registers most of its options in lazy way # Let's find all these options and manually register them @@ -102,4 +108,5 @@ HOOKS = {'aodh': aodh_config, 'keystone.common.config': keystone_config, 'neutron': neutron_misc, 'nova.spice': nova_spice, + 'sahara': sahara_init, 'zaqar': zaqar_config} diff --git a/tools/autogenerate-config-flagmappings/ignore.list b/tools/autogenerate-config-flagmappings/ignore.list index 79bb079b9c..bbb0a60a91 100644 --- a/tools/autogenerate-config-flagmappings/ignore.list +++ b/tools/autogenerate-config-flagmappings/ignore.list @@ -11,6 +11,8 @@ glance.db.sqlalchemy.alembic_migrations.env keystone.assignment.role_backends.sql keystone.assignment.V8_backends.sql manila.db.migrations.alembic.env +sahara.cli.image_pack.api +sahara.cli.image_pack.cli trove.guestagent.datastore.experimental.postgresql.manager trove.guestagent.datastore.experimental.postgresql.service.database trove.guestagent.datastore.experimental.postgresql.service.root