The default nano and micro flavors need more memory to boot on
ppc64. New flavors are 128MB and 256MB, respectively.
Trailing spaces removed, again.
Change-Id: Ic6740bda959754380982e67f753876dc6d984685
| ... | ... |
@@ -147,12 +147,21 @@ function configure_tempest() {
|
| 147 | 147 |
if [[ -z "$DEFAULT_INSTANCE_TYPE" ]]; then |
| 148 | 148 |
available_flavors=$(nova flavor-list) |
| 149 | 149 |
if [[ ! ( $available_flavors =~ 'm1.nano' ) ]]; then |
| 150 |
- nova flavor-create m1.nano 42 64 0 1 |
|
| 150 |
+ if is_arch "ppc64"; then |
|
| 151 |
+ # qemu needs at least 128MB of memory to boot on ppc64 |
|
| 152 |
+ nova flavor-create m1.nano 42 128 0 1 |
|
| 153 |
+ else |
|
| 154 |
+ nova flavor-create m1.nano 42 64 0 1 |
|
| 155 |
+ fi |
|
| 151 | 156 |
fi |
| 152 | 157 |
flavor_ref=42 |
| 153 | 158 |
boto_instance_type=m1.nano |
| 154 | 159 |
if [[ ! ( $available_flavors =~ 'm1.micro' ) ]]; then |
| 155 |
- nova flavor-create m1.micro 84 128 0 1 |
|
| 160 |
+ if is_arch "ppc64"; then |
|
| 161 |
+ nova flavor-create m1.micro 84 256 0 1 |
|
| 162 |
+ else |
|
| 163 |
+ nova flavor-create m1.micro 84 128 0 1 |
|
| 164 |
+ fi |
|
| 156 | 165 |
fi |
| 157 | 166 |
flavor_ref_alt=84 |
| 158 | 167 |
else |