Merge "Fix missing option in the test settings.py file"

This commit is contained in:
Jenkins 2014-02-11 04:17:21 +00:00 committed by Gerrit Code Review
commit 998efaf465
1 changed files with 9 additions and 1 deletions

View File

@ -115,7 +115,15 @@ OPENSTACK_NEUTRON_NETWORK = {
'enable_lb': True,
'enable_firewall': True,
'enable_quotas': False, # Enabled in specific tests only
'enable_vpn': True
'enable_vpn': True,
# If the profile_support config is turned on in local_settings
# the "router" dashboard will be enabled which can be used to
# create and use profiles with networks and instances. In which case
# using run_tests will require the registration of the "router" dashboard.
# TODO (absubram): Need to make this permanent when a better solution
# for run_tests is implemented to use with and without the n1k sub-plugin.
'profile_support': None,
#'profile_support': 'cisco'
}
OPENSTACK_HYPERVISOR_FEATURES = {