openstack/ironic
Code Issues Proposed changes

Merge "Add Link-Local-Connection info to ironic port"

Browse Source
This commit is contained in:
Jenkins 2016-06-24 07:50:25 +00:00 committed by Gerrit Code Review
commit c821888bb0
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
devstack/lib/ironic
View File

@ -207,6 +207,11 @@ IRONIC_AUTH_STRATEGY=${IRONIC_AUTH_STRATEGY:-keystone}
IRONIC_TERMINAL_SSL=$(trueorfalse False IRONIC_TERMINAL_SSL) IRONIC_TERMINAL_SSL=$(trueorfalse False IRONIC_TERMINAL_SSL)
IRONIC_TERMINAL_CERT_DIR=${IRONIC_TERMINAL_CERT_DIR:-$IRONIC_DATA_DIR/terminal_cert/} IRONIC_TERMINAL_CERT_DIR=${IRONIC_TERMINAL_CERT_DIR:-$IRONIC_DATA_DIR/terminal_cert/}
# This flag is used to allow adding Link-Local-Connection info
# to ironic port-create command. LLC info is obtained from
# IRONIC_{VM,HW}_NODES_FILE
IRONIC_USE_LINK_LOCAL=$(trueorfalse False IRONIC_USE_LINK_LOCAL)
# get_pxe_boot_file() - Get the PXE/iPXE boot file path # get_pxe_boot_file() - Get the PXE/iPXE boot file path
function get_pxe_boot_file { function get_pxe_boot_file {
local relpath=syslinux/pxelinux.0 local relpath=syslinux/pxelinux.0
@ -832,6 +837,21 @@ function enroll_nodes {
vbmc_port=$(echo $hardware_info | awk '{print $2}') vbmc_port=$(echo $hardware_info | awk '{print $2}')
node_options+=" -i ipmi_port=$vbmc_port" node_options+=" -i ipmi_port=$vbmc_port"
fi fi
# Local-link-connection options
if [[ "${IRONIC_USE_LINK_LOCAL}" == "True" ]]; then
local llc_opts=""
local switch_info
local switch_id
local port_id
switch_info=$(echo $hardware_info |awk '{print $3}')
switch_id=$(echo $hardware_info |awk '{print $4}')
port_id=$(echo $hardware_info |awk '{print $5}')
llc_opts="-l switch_id=${switch_id} -l switch_info=${switch_info} -l port_id=${port_id}"
local ironic_api_version='--ironic-api-version latest'
fi
else else
# Currently we require all hardware platform have same CPU/RAM/DISK info # Currently we require all hardware platform have same CPU/RAM/DISK info
# in future, this can be enhanced to support different type, and then # in future, this can be enhanced to support different type, and then
@ -887,7 +907,9 @@ function enroll_nodes {
ironic node-update $node_id add properties/root_device='{"vendor": "0x1af4"}' ironic node-update $node_id add properties/root_device='{"vendor": "0x1af4"}'
fi fi
ironic port-create --address $mac_address --node $node_id # In case we using portgroups, we should API version that support them.
# Othervise API will return 406 ERROR
ironic $ironic_api_version port-create --address $mac_address --node $node_id $llc_opts
total_nodes=$((total_nodes+1)) total_nodes=$((total_nodes+1))
total_cpus=$((total_cpus+$ironic_node_cpu)) total_cpus=$((total_cpus+$ironic_node_cpu))

3
devstack/tools/ironic/scripts/create-node.sh
View File

@ -78,4 +78,5 @@ fi
# echo mac # echo mac
VM_MAC=$(virsh dumpxml $NAME | grep "mac address" | head -1 | cut -d\' -f2) VM_MAC=$(virsh dumpxml $NAME | grep "mac address" | head -1 | cut -d\' -f2)
echo $VM_MAC $VBMC_PORT switch_id=$(ip link show dev $BRIDGE | egrep -o "ether [A-Za-z0-9:]+"|sed "s/ether\ //")
echo $VM_MAC $VBMC_PORT $BRIDGE $switch_id ovs-$NAME