diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 172048b860..f66aa8b094 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -359,12 +359,9 @@ function configure_ironic_conductor {
iniset $IRONIC_CONF_FILE pxe tftp_root $IRONIC_TFTPBOOT_DIR
iniset $IRONIC_CONF_FILE pxe tftp_master_path $IRONIC_TFTPBOOT_DIR/master_images
- local pxe_params=""
- if [[ "$IRONIC_VM_LOG_CONSOLE" == "True" ]] ; then
- pxe_params+="nofb nomodeset vga=normal console=ttyS0"
- if is_deployed_with_ipa_ramdisk; then
- pxe_params+=" systemd.journald.forward_to_console=yes"
- fi
+ local pxe_params="nofb nomodeset vga=normal console=ttyS0"
+ if is_deployed_with_ipa_ramdisk; then
+ pxe_params+=" systemd.journald.forward_to_console=yes"
fi
# When booting with less than 1GB, we need to switch from default tmpfs
# to ramfs for ramdisks to decompress successfully.
diff --git a/devstack/tools/ironic/scripts/configure-vm.py b/devstack/tools/ironic/scripts/configure-vm.py
index 2d5a9adf17..3bf8ebeb74 100755
--- a/devstack/tools/ironic/scripts/configure-vm.py
+++ b/devstack/tools/ironic/scripts/configure-vm.py
@@ -41,6 +41,16 @@ CONSOLE_LOG = """
"""
+CONSOLE_PTY = """
+
+
+
+
+
+
+"""
+
+
def main():
parser = argparse.ArgumentParser(
description="Configure a kvm virtual machine for the seed image.")
@@ -91,11 +101,9 @@ def main():
params['emulator'] = "/usr/bin/qemu-kvm"
if args.console_log:
- params['bios_serial'] = ""
- params['console_log'] = CONSOLE_LOG % {'console_log': args.console_log}
+ params['console'] = CONSOLE_LOG % {'console_log': args.console_log}
else:
- params['bios_serial'] = ''
- params['console_log'] = ''
+ params['console'] = CONSOLE_PTY
libvirt_template = source_template % params
conn = libvirt.open("qemu:///system")
diff --git a/devstack/tools/ironic/templates/vm.xml b/devstack/tools/ironic/templates/vm.xml
index ae7d685256..0131e15929 100644
--- a/devstack/tools/ironic/templates/vm.xml
+++ b/devstack/tools/ironic/templates/vm.xml
@@ -6,7 +6,7 @@
hvm
- %(bios_serial)s
+
@@ -40,7 +40,7 @@
- %(console_log)s
+ %(console)s