Merge "Remove rule for legacy deployment kernel update"

Author: Zuul

ansible/inventory/group_vars/all/bifrost

@@ -103,7 +103,7 @@ kolla_bifrost_inspector_port_addition: "{{ inspector_add_ports }}"
 kolla_bifrost_inspector_extra_kernel_options: "{{ inspector_extra_kernel_options }}"
 
 # List of introspection rules for Bifrost's Ironic Inspector service.
-kolla_bifrost_inspector_rules: "{{ inspector_rules + [inspector_rule_legacy_deploy_kernel] }}"
+kolla_bifrost_inspector_rules: "{{ inspector_rules }}"
 
 # Ironic inspector IPMI username to set.
 kolla_bifrost_inspector_ipmi_username: "{{ ipmi_username }}"
@@ -127,9 +127,6 @@ kolla_bifrost_inspector_deploy_kernel: "http://{{ provision_oc_net_name | net_ip
 # Ironic inspector deployment ramdisk location.
 kolla_bifrost_inspector_deploy_ramdisk: "http://{{ provision_oc_net_name | net_ip }}:8080/ipa.initramfs"
 
-# Ironic inspector legacy deployment kernel location.
-kolla_bifrost_inspector_legacy_deploy_kernel: "http://{{ provision_oc_net_name | net_ip }}:8080/ipa.vmlinuz"
-
 # Timeout of hardware inspection on overcloud nodes, in seconds. Default is
 # {{ inspector_inspection_timeout }}.
 kolla_bifrost_inspection_timeout: "{{ inspector_inspection_timeout }}"

ansible/inventory/group_vars/all/inspector

@@ -140,18 +140,6 @@ inspector_rule_deploy_kernel:
       path: "driver_info/deploy_kernel"
       value: "{{ inspector_rule_var_deploy_kernel }}"
 
-# Ironic inspector rule to update deployment kernel from legacy location.
-inspector_rule_legacy_deploy_kernel:
-  description: "Update deploy kernel from legacy"
-  conditions:
-    - field: "node://driver_info.deploy_kernel"
-      op: "eq"
-      value: "{{ inspector_rule_var_legacy_deploy_kernel }}"
-  actions:
-    - action: "set-attribute"
-      path: "driver_info/deploy_kernel"
-      value: "{{ inspector_rule_var_deploy_kernel }}"
-
 # Deployment ramdisk referenced by inspector rule.
 inspector_rule_var_deploy_ramdisk:
 

ansible/seed-introspection-rules.yml

@@ -19,5 +19,4 @@
       inspector_rule_var_lldp_switch_port_interface: "{{ kolla_bifrost_inspector_lldp_switch_port_interface }}"
       inspector_rule_var_deploy_kernel: "{{ kolla_bifrost_inspector_deploy_kernel }}"
       inspector_rule_var_deploy_ramdisk: "{{ kolla_bifrost_inspector_deploy_ramdisk }}"
-      inspector_rule_var_legacy_deploy_kernel: "{{ kolla_bifrost_inspector_legacy_deploy_kernel }}"
       when: kolla_enable_bifrost | bool

etc/kayobe/bifrost.yml

@@ -127,9 +127,6 @@
 # Ironic inspector deployment ramdisk location.
 #kolla_bifrost_inspector_deploy_ramdisk:
 
-# Ironic inspector legacy deployment kernel location.
-#kolla_bifrost_inspector_legacy_deploy_kernel:
-
 # Timeout of hardware inspection on overcloud nodes, in seconds. Default is
 # {{ inspector_inspection_timeout }}.
 #kolla_bifrost_inspection_timeout:

releasenotes/notes/remove-inspector-rule-legacy-deploy-kernel-1a4f1f5db58766ee.yaml

@@ -0,0 +1,12 @@
+---
+upgrade:
+  - |
+    Removes the Bifrost introspection rule that was updating the deploy kernel
+    location from the legacy ``ipa.vmlinuz`` path to the new ``ipa.kernel``
+    path. If this migration has not yet been applied, update the deployment
+    kernel location manually with:
+
+    ``OS_CLOUD=bifrost baremetal node set --driver-info deploy_kernel=<http://url/to/ipa.kernel> $NODE_UUID_OR_NAME``
+
+    This is only relevant for deployments with nodes discovered with the
+    OpenStack Train release or earlier.