Browse code

Merge "Set flavor id for Ironic's baremetal flavor"

Jenkins authored on 2014/09/10 22:31:40
Showing 1 changed files
... ...
@@ -497,8 +497,12 @@ function enroll_vms {
497 497
     done < $IRONIC_VM_MACS_CSV_FILE
498 498
 
499 499
     # create the nova flavor
500
+    # NOTE(adam_g): Attempting to use an autogenerated UUID for flavor id here uncovered
501
+    # bug (LP: #1333852) in Trove.  This can be changed to use an auto flavor id when the
502
+    # bug is fixed in Juno.
500 503
     local adjusted_disk=$(($IRONIC_VM_SPECS_DISK - $IRONIC_VM_EPHEMERAL_DISK))
501
-    nova flavor-create --ephemeral $IRONIC_VM_EPHEMERAL_DISK baremetal auto $IRONIC_VM_SPECS_RAM $adjusted_disk $IRONIC_VM_SPECS_CPU
504
+    nova flavor-create --ephemeral $IRONIC_VM_EPHEMERAL_DISK baremetal 551 $IRONIC_VM_SPECS_RAM $adjusted_disk $IRONIC_VM_SPECS_CPU
505
+
502 506
     # TODO(lucasagomes): Remove the 'baremetal:deploy_kernel_id'
503 507
     # and 'baremetal:deploy_ramdisk_id' parameters
504 508
     # from the flavor after the completion of