Merge "Add another 'fault' flavor"

This commit is contained in:
Jenkins 2016-06-23 20:58:56 +00:00 committed by Gerrit Code Review
commit 8eca7f3c45
2 changed files with 8 additions and 4 deletions

View File

@ -95,5 +95,7 @@
"neutron_enabled": %neutron_enabled%,
"shared_network": "%shared_network%",
"shared_network_subnet": "%shared_network_subnet%",
"instance_fault_flavor_name": "test.fault-5",
"instance_fault_eph_flavor_name": "test.eph.fault-5",
"instance_fault_1_flavor_name": "test.fault_1-1",
"instance_fault_1_eph_flavor_name": "test.eph.fault_1-1",
"instance_fault_2_flavor_name": "test.fault_2-5",
"instance_fault_2_eph_flavor_name": "test.eph.fault_2-5",

View File

@ -761,8 +761,10 @@ function add_test_flavors() {
add_flavor 'large' 26 2048 10 1
add_flavor 'large' 27 2048 15 1
# This should be big enough to cause Nova to fail allocation
add_flavor 'fault' 35 131072 5 1
# This will allow Nova to create an instance, but not enough disk to boot the image
add_flavor 'fault_1' 30 512 1 1
# This should be enough memory to cause Nova to fail entirely due to too much allocation
add_flavor 'fault_2' 31 131072 5 1
}
function cmd_test_init() {