diff options
author | Zuul <zuul@review.opendev.org> | 2023-05-09 06:29:42 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2023-05-09 06:29:42 +0000 |
commit | 1d0818cba2d948902ca056e6f82f873838415c0e (patch) | |
tree | 8f6d8daf14f6498b68c3e2e1d8642107b2244504 /devstack/lib/ironic | |
parent | 0e6935bb1d4306e626dbc427fa26469ed3e8070a (diff) | |
parent | f2605e928136f88032ef9b4977a076d5c535987b (diff) | |
download | ironic-1d0818cba2d948902ca056e6f82f873838415c0e.tar.gz |
Merge "Remove use of nomodeset by default"
Diffstat (limited to 'devstack/lib/ironic')
-rw-r--r-- | devstack/lib/ironic | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/devstack/lib/ironic b/devstack/lib/ironic index 51b2e2ba8..d82e1882d 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 |