Disable provisioning for multihost installations

Moved dirty hack of provisioning defaults to appropriate place.
Modified provisioning parameter groups so they are disabled
for multihost installations

Fixes: rhbz#bug1080369
Change-Id: I563db1c14e79ef639280f02360b0d5a5d119b70a
This commit is contained in:
Martin Magr
2014-03-25 16:12:19 +01:00
parent 90d7c80516
commit c39a37076c
2 changed files with 49 additions and 39 deletions

View File

@@ -816,27 +816,12 @@ def validateSingleFlag(options, flag):
msg = output_messages.ERR_ONLY_1_FLAG % ("--%s" % flag)
raise FlagValidationError(msg)
def setProvisioningDefaults():
conf_ids = [
'DEMO',
'TEMPEST',
'TEMPEST_REPO_URI',
'TEMPEST_REPO_REVISION',
'ALL_IN_ONE_OVS_BRIDGE',
]
pnames = ['CONFIG_PROVISION_' + x for x in conf_ids]
params = [controller.getParamByName(x) for x in pnames]
for param in params:
controller.CONF[param.CONF_NAME] = (
controller.CONF.get(param.CONF_NAME, param.DEFAULT_VALUE)
)
def initPluginsConfig():
for plugin in controller.getAllPlugins():
plugin.initConfig(controller)
def initPluginsSequences():
setProvisioningDefaults()
for plugin in controller.getAllPlugins():
plugin.initSequences(controller)