Merge "Bifrost: Add inspector_keep_ports option"

ansible/inventory/group_vars/all/bifrost

@@ -96,6 +96,10 @@ kolla_bifrost_inspector_hooks: "{{ inspector_hooks }}"
 # 'active' or 'pxe'.
 kolla_bifrost_inspector_port_addition: "{{ inspector_add_ports }}"
 
+# Which ports to keep after introspection. One of 'all', 'present', or 'added'.
+# Default follows Bifrost's default of 'present'.
+kolla_bifrost_inspector_keep_ports: "present"
+
 # List of extra kernel parameters for the inspector default PXE configuration.
 # Default is {{ inspector_extra_kernel_options }}, defined in inspector.yml.
 # When customising this variable, the default extra kernel parameters should be

ansible/roles/kolla-bifrost/defaults/main.yml

@@ -48,6 +48,9 @@ kolla_bifrost_inspector_hooks:
 # 'active' or 'pxe'.
 kolla_bifrost_inspector_port_addition:
 
+# Which ports to keep after introspection. One of 'all', 'present', or 'added'.
+kolla_bifrost_inspector_keep_ports:
+
 # List of extra kernel parameters for the inspector default PXE configuration.
 kolla_bifrost_inspector_extra_kernel_options:
 

ansible/roles/kolla-bifrost/templates/kolla/config/bifrost/bifrost.yml

@@ -39,6 +39,11 @@ inspector_hooks: "{{ kolla_bifrost_inspector_hooks | join(',') }}"
 inspector_port_addition: "{{ kolla_bifrost_inspector_port_addition }}"
 {% endif %}
 
+{% if kolla_bifrost_inspector_keep_ports %}
+# Which ports to keep after introspection. One of 'all', 'present', or 'added'.
+inspector_keep_ports: "{{ kolla_bifrost_inspector_keep_ports }}"
+{% endif %}
+
 {% if kolla_bifrost_inspector_extra_kernel_options %}
 # Extra kernel parameters for the inspector default PXE configuration.
 inspector_extra_kernel_options: "{{ kolla_bifrost_inspector_extra_kernel_options if kolla_bifrost_inspector_extra_kernel_options is string else kolla_bifrost_inspector_extra_kernel_options | join(' ') }}"

doc/source/configuration/reference/bifrost.rst

@@ -276,6 +276,9 @@ The following options configure the Ironic Inspector service in the
     Which MAC addresses to add as ports during introspection. One of ``all``,
     ``active`` or ``pxe``. Default is ``{{ inspector_add_ports }}``, defined in
     ``${KAYOBE_CONFIG_PATH}/inspector.yml``.
+``kolla_bifrost_inspector_keep_ports``
+    Which ports to keep after introspection. One of ``all``, ``present`` or
+    ``added``. Default is ``present`` to align with Bifrost's defaults.
 ``kolla_bifrost_inspector_extra_kernel_options``
     List of extra kernel parameters for the inspector default PXE
     configuration. Default is ``{{ inspector_extra_kernel_options }}``, defined

etc/kayobe/bifrost.yml

@@ -96,6 +96,10 @@
 # 'active' or 'pxe'.
 #kolla_bifrost_inspector_port_addition:
 
+# Which ports to keep after introspection. One of 'all', 'present', or 'added'.
+# Default follows Bifrost's default of 'present'.
+#kolla_bifrost_inspector_keep_ports:
+
 # List of extra kernel parameters for the inspector default PXE configuration.
 # Default is {{ inspector_extra_kernel_options }}, defined in inspector.yml.
 # When customising this variable, the default extra kernel parameters should be

releasenotes/notes/bifrost-keep-ports-5f2e583a201645b9.yaml

@@ -0,0 +1,6 @@
+---
+features:
+  - |
+    Allows configuring ``inspector_keep_ports`` for Bifrost via
+    ``kolla_bifrost_inspector_keep_ports`` (defaults to ``present`` to match
+    Bifrost).