openstack/ironic
Code Issues Proposed changes

Merge "Allow user to set arch for the baremetal flavor and ironic node"

Browse Source
This commit is contained in:
Jenkins 2016-01-05 18:14:46 +00:00 committed by Gerrit Code Review
commit c9f40b7db1
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
devstack/lib/ironic
View File

@ -53,6 +53,7 @@ IRONIC_HW_NODE_CPU=${IRONIC_HW_NODE_CPU:-1}
IRONIC_HW_NODE_RAM=${IRONIC_HW_NODE_RAM:-512} IRONIC_HW_NODE_RAM=${IRONIC_HW_NODE_RAM:-512}
IRONIC_HW_NODE_DISK=${IRONIC_HW_NODE_DISK:-10} IRONIC_HW_NODE_DISK=${IRONIC_HW_NODE_DISK:-10}
IRONIC_HW_EPHEMERAL_DISK=${IRONIC_HW_EPHEMERAL_DISK:-0} IRONIC_HW_EPHEMERAL_DISK=${IRONIC_HW_EPHEMERAL_DISK:-0}
IRONIC_HW_ARCH=${IRONIC_HW_ARCH:-x86_64}
# The file is composed of multiple lines, each line includes four field # The file is composed of multiple lines, each line includes four field
# separated by white space: IPMI address, MAC address, IPMI username # separated by white space: IPMI address, MAC address, IPMI username
# and IPMI password. # and IPMI password.
@ -623,6 +624,7 @@ function enroll_nodes {
local ironic_node_ram=$IRONIC_VM_SPECS_RAM local ironic_node_ram=$IRONIC_VM_SPECS_RAM
local ironic_node_disk=$IRONIC_VM_SPECS_DISK local ironic_node_disk=$IRONIC_VM_SPECS_DISK
local ironic_ephemeral_disk=$IRONIC_VM_EPHEMERAL_DISK local ironic_ephemeral_disk=$IRONIC_VM_EPHEMERAL_DISK
local ironic_node_arch=x86_64
local ironic_hwinfo_file=$IRONIC_VM_MACS_CSV_FILE local ironic_hwinfo_file=$IRONIC_VM_MACS_CSV_FILE
local node_options="\ local node_options="\
-i deploy_kernel=$IRONIC_DEPLOY_KERNEL_ID \ -i deploy_kernel=$IRONIC_DEPLOY_KERNEL_ID \
@ -637,6 +639,7 @@ function enroll_nodes {
local ironic_node_ram=$IRONIC_HW_NODE_RAM local ironic_node_ram=$IRONIC_HW_NODE_RAM
local ironic_node_disk=$IRONIC_HW_NODE_DISK local ironic_node_disk=$IRONIC_HW_NODE_DISK
local ironic_ephemeral_disk=$IRONIC_HW_EPHEMERAL_DISK local ironic_ephemeral_disk=$IRONIC_HW_EPHEMERAL_DISK
local ironic_node_arch=$IRONIC_HW_ARCH
if [[ -z "${IRONIC_DEPLOY_DRIVER##*_ipmitool}" ]]; then if [[ -z "${IRONIC_DEPLOY_DRIVER##*_ipmitool}" ]]; then
local ironic_hwinfo_file=$IRONIC_IPMIINFO_FILE local ironic_hwinfo_file=$IRONIC_IPMIINFO_FILE
fi fi
@ -680,7 +683,7 @@ function enroll_nodes {
-p cpus=$ironic_node_cpu\ -p cpus=$ironic_node_cpu\
-p memory_mb=$ironic_node_ram\ -p memory_mb=$ironic_node_ram\
-p local_gb=$ironic_node_disk\ -p local_gb=$ironic_node_disk\
-p cpu_arch=x86_64 \ -p cpu_arch=$ironic_node_arch \
$node_options \ $node_options \
| grep " uuid " | get_field 2) | grep " uuid " | get_field 2)
@ -694,7 +697,7 @@ function enroll_nodes {
adjusted_disk=$(($ironic_node_disk - $ironic_ephemeral_disk)) adjusted_disk=$(($ironic_node_disk - $ironic_ephemeral_disk))
nova flavor-create --ephemeral $ironic_ephemeral_disk baremetal auto $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"="$ironic_node_arch"
if [ "$VIRT_DRIVER" == "ironic" ]; then if [ "$VIRT_DRIVER" == "ironic" ]; then
wait_for_nova_resources "count" $total_nodes wait_for_nova_resources "count" $total_nodes