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
This commit is contained in:
Stephen Finucane 2017-03-22 15:29:54 +00:00
parent 54cb8c45b6
commit 1b07c0be96
2 changed files with 9 additions and 0 deletions

View File

@ -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}

View File

@ -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