Ensure CONFIG_PROVISION_* variables always get set

Also removes some now-unnecessary checks.

Change-Id: I19cc2ba4a9b733a78648d9f58f0f1538442d574d
This commit is contained in:
Terry Wilson
2013-07-23 07:53:51 -05:00
parent 0ca7d5ac37
commit af56b69282
3 changed files with 10 additions and 6 deletions

View File

@@ -128,11 +128,9 @@ def marshall_conf_bool(conf, key):
def initSequences(controller):
provisioning_required = (
(controller.CONF['CONFIG_QUANTUM_INSTALL']== 'y' and
(controller.CONF['CONFIG_PROVISION_DEMO'] == 'y'
controller.CONF['CONFIG_PROVISION_DEMO'] == 'y'
or
controller.CONF['CONFIG_PROVISION_TEMPEST'] == 'y')
)
controller.CONF['CONFIG_PROVISION_TEMPEST'] == 'y'
)
if not provisioning_required:
return