diff options
Diffstat (limited to 'devstack')
| -rw-r--r-- | devstack/lib/ironic | 4 | ||||
| -rwxr-xr-x | devstack/tools/ironic/scripts/cirros-partition.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 17ba547f1..b81b9f38b 100644 --- a/devstack/lib/ironic +++ b/devstack/lib/ironic @@ -1793,7 +1793,7 @@ function configure_ironic_conductor { -subj '/O=OpenStack/OU=DevStack Servers' fi - local pxe_params="nofb nomodeset console=${IRONIC_TTY_DEV}" + local pxe_params="nofb console=${IRONIC_TTY_DEV}" pxe_params+=" systemd.journald.forward_to_console=yes" if is_service_enabled tls-proxy; then pxe_params+=" ipa-insecure=1" @@ -1805,7 +1805,7 @@ function configure_ironic_conductor { iniset $IRONIC_CONF_FILE pxe kernel_append_params "$pxe_params" fi - local kernel_append_params="nofb nomodeset console=${IRONIC_TTY_DEV}" + local kernel_append_params="nofb console=${IRONIC_TTY_DEV}" kernel_append_params+=" systemd.journald.forward_to_console=yes" # NOTE(dtantsur): avoid setting ipa-insecure for redfish, we have a way to diff --git a/devstack/tools/ironic/scripts/cirros-partition.sh b/devstack/tools/ironic/scripts/cirros-partition.sh index facf9b030..38e1764c4 100755 --- a/devstack/tools/ironic/scripts/cirros-partition.sh +++ b/devstack/tools/ironic/scripts/cirros-partition.sh @@ -18,7 +18,7 @@ IRONIC_TTY_DEV=${IRONIC_TTY_DEV:-ttyS0,115200} # rdroot : boot from the ramdisk present on the root partition instead of # mounting the root partition. # dslist : disable Nova metadata support, it takes a long time on boot. -KARGS=${KARGS:-nofb nomodeset vga=normal console=${IRONIC_TTY_DEV} rdroot dslist=configdrive} +KARGS=${KARGS:-nofb vga=normal console=${IRONIC_TTY_DEV} rdroot dslist=configdrive} workdir=$(mktemp -d) root_mp=$workdir/root |