Fix demo bridge setup

For cases where no network host is the same host as controller host
bridge<->subnet binding fails because there is no br-ex on controller.

Change-Id: Ie0761af0d9e91c5e17b3c8ecd09d1d7a0c2a0ed0
This commit is contained in:
Martin Mágr
2015-08-19 09:19:54 +02:00
committed by Lukas Bezdicka
parent 3015bff80d
commit 38e23465a7
7 changed files with 70 additions and 90 deletions

View File

@@ -753,12 +753,6 @@ def single_step_aio_install(options, logFile):
if not options.novanetwork_privif:
options.novanetwork_privif = ''
# If we are doing an all-in-one install, do demo provisioning
# unless specifically told not to
if (options.os_neutron_install != "n" and
not options.provision_all_in_one_ovs_bridge):
options.provision_all_in_one_ovs_bridge = "y"
single_step_install(options, logFile)