From b6962184186987b80005c2ee26e1a514dcc9c2c1 Mon Sep 17 00:00:00 2001 From: Yibo Cai Date: Tue, 17 May 2016 15:56:58 +0800 Subject: [PATCH] devstack: Configure console device name 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 --- devstack/lib/ironic | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 2c3ed96f58..8d4ecc6b97 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -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