Browse code

Merge "lib/tempest: use OSC to create nova flavors."

Jenkins authored on 2016/11/29 08:43:56
Showing 1 changed files
... ...
@@ -193,11 +193,11 @@ function configure_tempest {
193 193
         available_flavors=$(nova flavor-list)
194 194
         if  [[ -z "$DEFAULT_INSTANCE_TYPE" ]]; then
195 195
             if [[ ! ( $available_flavors =~ 'm1.nano' ) ]]; then
196
-                nova flavor-create m1.nano 42 64 0 1
196
+                openstack flavor create --id 42 --ram 64 --disk 0 --vcpus 1 m1.nano
197 197
             fi
198 198
             flavor_ref=42
199 199
             if [[ ! ( $available_flavors =~ 'm1.micro' ) ]]; then
200
-                nova flavor-create m1.micro 84 128 0 1
200
+                openstack flavor create --id 84 --ram 128 --disk 0 --vcpus 1 m1.micro
201 201
             fi
202 202
             flavor_ref_alt=84
203 203
         else
... ...
@@ -397,7 +397,7 @@ function configure_tempest {
397 397
             # build a specialized heat flavor
398 398
             available_flavors=$(nova flavor-list)
399 399
             if [[ ! ( $available_flavors =~ 'm1.heat' ) ]]; then
400
-                nova flavor-create m1.heat 451 512 0 1
400
+                openstack flavor create --id 451 --ram 512 --disk 0 --vcpus 1 m1.heat
401 401
             fi
402 402
             iniset $TEMPEST_CONFIG orchestration instance_type "m1.heat"
403 403
         fi