x/packstack
Code Issues Proposed changes

If allinone and quantum selected, install basic network

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

9
packstack/installer/run_setup.py
View File

@@ -655,6 +655,15 @@ def single_step_aio_install(options):
if not options.novanetwork_privif: if not options.novanetwork_privif:
options.novanetwork_privif = "lo" options.novanetwork_privif = "lo"
# If we are doing an all-in-one install and quantum isn't disabled
# go ahead and set up a basic network and external bridge unless
# specifically told not to
if options.os_quantum_install != "n":
if not options.provision_demo:
options.provision_demo = "y"
if not options.provision_all_in_one_ovs_bridge:
options.provision_all_in_one_ovs_bridge = "y"
single_step_install(options) single_step_install(options)
def single_step_install(options): def single_step_install(options):

6
packstack/plugins/provision_700.py
View File

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