openstack/devstack
Code Issues Proposed changes

Merge "Use autogenerated flavor id"

Browse Source
This commit is contained in:
Jenkins 2015-11-30 17:25:34 +00:00 committed by Gerrit Code Review
commit b85807875a
1 changed files with 1 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ironic
View File

@ -652,13 +652,9 @@ function enroll_nodes {
total_cpus=$((total_cpus+$ironic_node_cpu)) total_cpus=$((total_cpus+$ironic_node_cpu))
done < $ironic_hwinfo_file done < $ironic_hwinfo_file
# create the nova flavor
# NOTE(adam_g): Attempting to use an autogenerated UUID for flavor id here uncovered
# bug (LP: #1333852) in Trove. This can be changed to use an auto flavor id when the
# bug is fixed in Juno.
local adjusted_disk local adjusted_disk
adjusted_disk=$(($ironic_node_disk - $ironic_ephemeral_disk)) adjusted_disk=$(($ironic_node_disk - $ironic_ephemeral_disk))
nova flavor-create --ephemeral $ironic_ephemeral_disk baremetal 551 $ironic_node_ram $adjusted_disk $ironic_node_cpu nova flavor-create --ephemeral $ironic_ephemeral_disk baremetal auto $ironic_node_ram $adjusted_disk $ironic_node_cpu
nova flavor-key baremetal set "cpu_arch"="x86_64" nova flavor-key baremetal set "cpu_arch"="x86_64"