diff options
| author | Zuul <zuul@review.opendev.org> | 2026-03-16 15:34:46 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2026-03-16 15:34:46 +0000 |
| commit | 4d0c1d0f29aef63c860b72dffa0eabb1011108ea (patch) | |
| tree | 0e6f42cd1bd421ea4cd268eb8b1e7e585c53af8d /ansible | |
| parent | e24f8fd9a0d3828e75899b8d0d1e9bf7558341ce (diff) | |
| parent | b0b798a397f7744ec473ba0101708a51a0d35db1 (diff) | |
| download | kolla-ansible-4d0c1d0f29aef63c860b72dffa0eabb1011108ea.tar.gz kolla-ansible-4d0c1d0f29aef63c860b72dffa0eabb1011108ea.zip | |
Merge "Ironic parameter rework and default NTP server"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/roles/ironic/defaults/main.yml | 20 | ||||
| -rw-r--r-- | ansible/roles/ironic/templates/ironic.conf.j2 | 2 |
2 files changed, 21 insertions, 1 deletions
diff --git a/ansible/roles/ironic/defaults/main.yml b/ansible/roles/ironic/defaults/main.yml index e9e2163fe..c7f746cb2 100644 --- a/ansible/roles/ironic/defaults/main.yml +++ b/ansible/roles/ironic/defaults/main.yml @@ -362,3 +362,23 @@ ironic_copy_certs: "{{ kolla_copy_ca_into_containers | bool or ironic_enable_tls # WSGI ############ ironic_wsgi_provider: "uwsgi" + +############ +# NTP +############ +# If set, pass this NTP server via the kernel command line to IPA +ironic_ntp_server: "" + +#################### +# Kernel Parameters +#################### +ironic_kernel_append_params_default: + - "nofb" + - "nomodeset" + - "vga=normal" + - "console=tty0" + - "console=ttyS0,{{ ironic_console_serial_speed }}" + - "{% if ironic_ntp_server is not none and ironic_ntp_server | length > 0 %}ipa-ntp-server={{ ironic_ntp_server }}{% endif %}" + +ironic_kernel_append_params_extras: [] +ironic_kernel_append_params: "{{ (ironic_kernel_append_params_default + ironic_kernel_append_params_extras) | select() | join(' ') }}" diff --git a/ansible/roles/ironic/templates/ironic.conf.j2 b/ansible/roles/ironic/templates/ironic.conf.j2 index 7ed1a9e9d..9cc4fd78e 100644 --- a/ansible/roles/ironic/templates/ironic.conf.j2 +++ b/ansible/roles/ironic/templates/ironic.conf.j2 @@ -178,7 +178,7 @@ deploy_logs_storage_backend = local deploy_logs_collect = always [pxe] -kernel_append_params = nofb nomodeset vga=normal console=tty0 console=ttyS0,{{ ironic_console_serial_speed }} +kernel_append_params = {{ ironic_kernel_append_params }} tftp_root = /var/lib/ironic/tftpboot tftp_master_path = /var/lib/ironic/master_images tftp_server = {{ api_interface_address }} |