Change remaining savanna namespaces in setup.cfg
* savanna.cluster.plugins, savanna.infrastructure.engine, savanna.remote * Remove the 'savanna ', only support 'direct' and 'heat' * Change 'base' in openstack-common.conf to 'sahara' Partial-implements: blueprint savanna-renaming-service Change-Id: I82f7f98794b86a305aff544eb6f77f1a8810d9d7
This commit is contained in:
parent
1e7ed6e29d
commit
e0ba25c104
@ -19,4 +19,4 @@ module=uuidutils
|
||||
module=xmlutils
|
||||
|
||||
# The base module to hold the copy of openstack.common
|
||||
base=savanna
|
||||
base=sahara
|
||||
|
@ -159,7 +159,7 @@ def _get_infrastructure_engine():
|
||||
CONF.infrastructure_engine)
|
||||
|
||||
extension_manager = stevedore.DriverManager(
|
||||
namespace='savanna.infrastructure.engine',
|
||||
namespace='sahara.infrastructure.engine',
|
||||
name=CONF.infrastructure_engine,
|
||||
invoke_on_load=True
|
||||
)
|
||||
@ -171,7 +171,7 @@ def _get_remote_driver():
|
||||
LOG.info("Loading '%s' remote" % CONF.remote)
|
||||
|
||||
extension_manager = stevedore.DriverManager(
|
||||
namespace='savanna.remote',
|
||||
namespace='sahara.remote',
|
||||
name=CONF.remote,
|
||||
invoke_on_load=True
|
||||
)
|
||||
|
@ -90,7 +90,7 @@ class PluginManager(object):
|
||||
config_plugins = CONF.plugins
|
||||
extension_manager = enabled.EnabledExtensionManager(
|
||||
check_func=lambda ext: ext.name in config_plugins,
|
||||
namespace='savanna.cluster.plugins',
|
||||
namespace='sahara.cluster.plugins',
|
||||
invoke_on_load=True
|
||||
)
|
||||
|
||||
|
@ -33,17 +33,16 @@ console_scripts =
|
||||
sahara-db-manage = sahara.db.migration.cli:main
|
||||
_sahara-subprocess = sahara.cli.sahara_subprocess:main
|
||||
|
||||
savanna.cluster.plugins =
|
||||
sahara.cluster.plugins =
|
||||
vanilla = sahara.plugins.vanilla.plugin:VanillaProvider
|
||||
hdp = sahara.plugins.hdp.ambariplugin:AmbariPlugin
|
||||
idh = sahara.plugins.intel.plugin:IDHProvider
|
||||
|
||||
savanna.infrastructure.engine =
|
||||
savanna = sahara.service.direct_engine:DirectEngine
|
||||
sahara.infrastructure.engine =
|
||||
direct = sahara.service.direct_engine:DirectEngine
|
||||
heat = sahara.service.heat_engine:HeatEngine
|
||||
|
||||
savanna.remote =
|
||||
sahara.remote =
|
||||
ssh = sahara.utils.ssh_remote:SshRemoteDriver
|
||||
agent = sahara.utils.agent_remote:AgentRemoteDriver
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user