diff --git a/playbooks/roles/bifrost-ironic-install/defaults/main.yml b/playbooks/roles/bifrost-ironic-install/defaults/main.yml index 3870be8d2..463eac53e 100644 --- a/playbooks/roles/bifrost-ironic-install/defaults/main.yml +++ b/playbooks/roles/bifrost-ironic-install/defaults/main.yml @@ -373,3 +373,11 @@ prometheus_exporter_data_dir: /var/lib/ironic-prometheus-exporter/data sensor_data_interval: 90 # sensor data should be collected from undeployed nodes sensor_data_undeployed_nodes: false + +# Internal variables +pxe_kernel_params: >- + nofb nomodeset systemd.journald.forward_to_console=yes + {% if testing | bool %}console=ttyS0{% endif %} + ipa-insecure=1 + {{ extra_kernel_options | default('') }} +redfish_kernel_params: "{{ pxe_kernel_params }}" diff --git a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 index 80f52528f..6496d2e8f 100644 --- a/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 +++ b/playbooks/roles/bifrost-ironic-install/templates/ironic.conf.j2 @@ -62,11 +62,7 @@ deploy_logs_local_path = {{ ironic_agent_deploy_logs_local_path }} {% endif %} [pxe] -{% if testing | bool %} -pxe_append_params = console=ttyS0 ipa-insecure=1 -{% else %} -pxe_append_params = systemd.journald.forward_to_console=yes ipa-insecure=1 {{ extra_kernel_options | default('') }} -{% endif %} +pxe_append_params = {{ pxe_kernel_params }} tftp_server = {{ internal_ip }} tftp_root = /tftpboot ipxe_boot_script = /etc/ironic/boot.ipxe @@ -122,11 +118,7 @@ use_web_server_for_images = true [redfish] use_swift = False -{% if testing | bool %} -kernel_append_params = console=ttyS0 ipa-insecure=1 {{ extra_kernel_options | default('') }} -{% else %} -kernel_append_params = systemd.journald.forward_to_console=yes ipa-insecure=1 {{ extra_kernel_options | default('') }} -{% endif %} +kernel_append_params = {{ redfish_kernel_params }} {% if enable_inspector | bool == true %} [inspector]