diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-06-23 20:58:56 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-06-23 20:58:56 +0000 |
| commit | 8eca7f3c456255b40ec8e4f13cd37bb2bf8073f4 (patch) | |
| tree | e6c459ffc444cbddc3cd406875d245b3e0b44c18 | |
| parent | 71d1887a997128f693b14c6148ee67427cd06f00 (diff) | |
| parent | e3ae175d84b6c56d607e84776dd4ce3187c1cbf0 (diff) | |
| download | trove-integration-8eca7f3c456255b40ec8e4f13cd37bb2bf8073f4.tar.gz | |
Merge "Add another 'fault' flavor"
| -rw-r--r-- | scripts/conf/test_begin.conf | 6 | ||||
| -rwxr-xr-x | scripts/redstack | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/scripts/conf/test_begin.conf b/scripts/conf/test_begin.conf index d6f5c8d..eff96de 100644 --- a/scripts/conf/test_begin.conf +++ b/scripts/conf/test_begin.conf @@ -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", diff --git a/scripts/redstack b/scripts/redstack index 1800803..7b3684a 100755 --- a/scripts/redstack +++ b/scripts/redstack @@ -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() { |