From 5d29fb4e17663f0f7751a5bf5a2163386768b1ce Mon Sep 17 00:00:00 2001 From: Jonathan Rosser Date: Mon, 14 Nov 2022 18:32:37 +0000 Subject: [PATCH] Update variables for switchport introspection during inspection 1) The variable to allow processing hooks to be configured is used in the ironic-inspector template but not documented in the role defaults. Add the default and an example of usage. 2) When using LLDP to discover switchport connections during inspection it is necessary to pass an additional kernel parameter to the deploy image but there is no variable to allow this to happen. This patch adds a variable that the deployer can use to pass arbitrary kernel parameters to the deploy image. Change-Id: I2f67dfcf4164e009bf53e9324bd430aec4c97dcb --- defaults/main.yml | 7 +++++++ templates/inspector.ipxe.j2 | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/defaults/main.yml b/defaults/main.yml index f439cd3c..34d6aeed 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -406,6 +406,13 @@ ironic_deploy_image_list: ironic_inspector_enable_discovery: True ironic_inspector_openstack_db_connection_string: "mysql+pymysql://{{ ironic_inspector_galera_user }}:{{ ironic_inspector_container_mysql_password }}@{{ ironic_inspector_galera_address }}:{{ ironic_inspector_galera_port }}/{{ ironic_inspector_galera_database }}?charset=utf8{% if ironic_inspector_galera_use_ssl | bool %}&ssl_verify_cert=true{% if ironic_inspector_galera_ssl_ca_cert | length > 0 %}&ssl_ca={{ ironic_inspector_galera_ssl_ca_cert }}{% endif %}{% endif %}" +#define this to adjust the inspector processing hooks +#Example: +#ironic_inspector_processing_hooks: "$default_processing_hooks,lldp_basic,local_link_connection" + +#pass additional kernel paramters to the deploy image +ironic_inspector_extra_callback_parameters: '' + # Ironic inspector dhcp ironic_inspector_dhcp_address: "{{ ironic_bmaas_address }}" ironic_inspector_dhcp_pool_range: 192.168.0.51 192.168.0.150 diff --git a/templates/inspector.ipxe.j2 b/templates/inspector.ipxe.j2 index e37580d0..1f0f9758 100644 --- a/templates/inspector.ipxe.j2 +++ b/templates/inspector.ipxe.j2 @@ -5,6 +5,6 @@ dhcp || goto retry_dhcp :retry_boot imgfree -kernel --timeout 30000 {{ ironic_http_url }}/{{ ironic_deploy_image_kernel_name }} ipa-inspection-callback-url={{ ironic_inspector_callback_url }} systemd.journald.forward_to_console=yes BOOTIF=${mac} initrd={{ ironic_deploy_image_initramfs_name }} || goto retry_boot +kernel --timeout 30000 {{ ironic_http_url }}/{{ ironic_deploy_image_kernel_name }} ipa-inspection-callback-url={{ ironic_inspector_callback_url }} {{ ironic_inspector_extra_callback_parameters }} systemd.journald.forward_to_console=yes BOOTIF=${mac} initrd={{ ironic_deploy_image_initramfs_name }} || goto retry_boot initrd --timeout 30000 {{ ironic_http_url }}/{{ ironic_deploy_image_initramfs_name }} || goto retry_boot boot