openstack/ironic
Code Issues Proposed changes

devstack: Configure console device name

Browse Source 
Console device name is hardcoded to ttyS0 in ironic devstack plugin.
On some architecture, serial device name may not be ttyS0. For example,
ttyAMA0 for ARM.

This patch adds parameter IRONIC_TTY_DEV to configure console device
name, and keeps using ttyS0 if it's not set.

Closes-Bug: #1582564

Change-Id: I13c67e2c5d573c5b79776746e08a84c60861d6a7
Signed-off-by: Yibo Cai <yibo.cai@linaro.org>
This commit is contained in:
Yibo Cai 2016-05-17 15:56:58 +08:00
parent e66df7a05c
commit b696218418
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
devstack/lib/ironic
View File

@ -119,6 +119,7 @@ IRONIC_VM_MACS_CSV_FILE=${IRONIC_VM_MACS_CSV_FILE:-$IRONIC_DATA_DIR/ironic_macs.
IRONIC_AUTHORIZED_KEYS_FILE=${IRONIC_AUTHORIZED_KEYS_FILE:-$HOME/.ssh/authorized_keys}
IRONIC_CLEAN_NET_NAME=${IRONIC_CLEAN_NET_NAME:-private}
IRONIC_EXTRA_PXE_PARAMS=${IRONIC_EXTRA_PXE_PARAMS:-}
IRONIC_TTY_DEV=${IRONIC_TTY_DEV:-ttyS0}
# By default, baremetal VMs will console output to file.
IRONIC_VM_LOG_CONSOLE=$(trueorfalse True IRONIC_VM_LOG_CONSOLE)
@ -487,7 +488,7 @@ function configure_ironic_conductor {
-subj '/O=OpenStack/OU=DevStack Servers'
fi
local pxe_params="nofb nomodeset vga=normal console=ttyS0"
local pxe_params="nofb nomodeset vga=normal console=${IRONIC_TTY_DEV}"
if is_deployed_with_ipa_ramdisk; then
pxe_params+=" systemd.journald.forward_to_console=yes ipa-debug=1"
fi