Ensure Nova Network-compatible demo provisioning

Due to a limitation in the implementation of openstack::provision,
demo provisioning was previously limited to deployments with
Neutron.  This change adds support for provisioning users and
images and configuring tempest for deployments using Nova Network.

Closes-Bug: #1242668

Change-Id: Ic5d35e1f0f4f1fb8815193a7573955952dd698e4
This commit is contained in:
Maru Newby
2013-10-21 15:04:51 +00:00
parent 00fc4fa9ed
commit d3bb52e0a2
4 changed files with 30 additions and 16 deletions

View File

@@ -651,13 +651,12 @@ def single_step_aio_install(options):
if not options.novanetwork_privif:
options.novanetwork_privif = "lo"
# If we are doing an all-in-one install and neutron isn't disabled
# go ahead and set up a basic network and external bridge unless
# specifically told not to
if options.os_neutron_install != "n":
if not options.provision_demo:
options.provision_demo = "y"
if not options.provision_all_in_one_ovs_bridge:
# If we are doing an all-in-one install, do demo provisioning
# unless specifically told not to
if not options.provision_demo:
options.provision_demo = "y"
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)