If allinone and quantum selected, install basic network

Also ensures that selecting os-quantum-install=n on the CLI
doesn't cause installation to error out.
Change-Id: I1f4df4a93a1e7f4d513d47d4589792e8c39e13e0
This commit is contained in:
Terry Wilson
2013-07-15 14:33:28 -05:00
parent a5a60d8969
commit d1c32a5cff
2 changed files with 13 additions and 2 deletions

View File

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