Skip to content

Commit 56a33de

Browse files
committed
Remove rule for legacy deployment kernel update
This rule was introduced in the 2023.2 release and backported to previous releases (Yoga being the oldest) [1]. It is also relevant only for deployments that were created on the Train release or earlier. Assume that the migration was performed and remove the rule definition. [1] https://review.opendev.org/c/openstack/kayobe/+/808111 Change-Id: Ib180dd96242fd153b326076ca732b4d58f511a44 Signed-off-by: Pierre Riteau <pierre@stackhpc.com>
1 parent 8fb065f commit 56a33de

File tree

5 files changed

+13
-20
lines changed

5 files changed

+13
-20
lines changed

ansible/inventory/group_vars/all/bifrost

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ kolla_bifrost_inspector_port_addition: "{{ inspector_add_ports }}"
103103
kolla_bifrost_inspector_extra_kernel_options: "{{ inspector_extra_kernel_options }}"
104104

105105
# List of introspection rules for Bifrost's Ironic Inspector service.
106-
kolla_bifrost_inspector_rules: "{{ inspector_rules + [inspector_rule_legacy_deploy_kernel] }}"
106+
kolla_bifrost_inspector_rules: "{{ inspector_rules }}"
107107

108108
# Ironic inspector IPMI username to set.
109109
kolla_bifrost_inspector_ipmi_username: "{{ ipmi_username }}"
@@ -127,9 +127,6 @@ kolla_bifrost_inspector_deploy_kernel: "http://{{ provision_oc_net_name | net_ip
127127
# Ironic inspector deployment ramdisk location.
128128
kolla_bifrost_inspector_deploy_ramdisk: "http://{{ provision_oc_net_name | net_ip }}:8080/ipa.initramfs"
129129

130-
# Ironic inspector legacy deployment kernel location.
131-
kolla_bifrost_inspector_legacy_deploy_kernel: "http://{{ provision_oc_net_name | net_ip }}:8080/ipa.vmlinuz"
132-
133130
# Timeout of hardware inspection on overcloud nodes, in seconds. Default is
134131
# {{ inspector_inspection_timeout }}.
135132
kolla_bifrost_inspection_timeout: "{{ inspector_inspection_timeout }}"

ansible/inventory/group_vars/all/inspector

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -140,18 +140,6 @@ inspector_rule_deploy_kernel:
140140
path: "driver_info/deploy_kernel"
141141
value: "{{ inspector_rule_var_deploy_kernel }}"
142142

143-
# Ironic inspector rule to update deployment kernel from legacy location.
144-
inspector_rule_legacy_deploy_kernel:
145-
description: "Update deploy kernel from legacy"
146-
conditions:
147-
- field: "node://driver_info.deploy_kernel"
148-
op: "eq"
149-
value: "{{ inspector_rule_var_legacy_deploy_kernel }}"
150-
actions:
151-
- action: "set-attribute"
152-
path: "driver_info/deploy_kernel"
153-
value: "{{ inspector_rule_var_deploy_kernel }}"
154-
155143
# Deployment ramdisk referenced by inspector rule.
156144
inspector_rule_var_deploy_ramdisk:
157145

ansible/seed-introspection-rules.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,4 @@
1919
inspector_rule_var_lldp_switch_port_interface: "{{ kolla_bifrost_inspector_lldp_switch_port_interface }}"
2020
inspector_rule_var_deploy_kernel: "{{ kolla_bifrost_inspector_deploy_kernel }}"
2121
inspector_rule_var_deploy_ramdisk: "{{ kolla_bifrost_inspector_deploy_ramdisk }}"
22-
inspector_rule_var_legacy_deploy_kernel: "{{ kolla_bifrost_inspector_legacy_deploy_kernel }}"
2322
when: kolla_enable_bifrost | bool

etc/kayobe/bifrost.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -127,9 +127,6 @@
127127
# Ironic inspector deployment ramdisk location.
128128
#kolla_bifrost_inspector_deploy_ramdisk:
129129

130-
# Ironic inspector legacy deployment kernel location.
131-
#kolla_bifrost_inspector_legacy_deploy_kernel:
132-
133130
# Timeout of hardware inspection on overcloud nodes, in seconds. Default is
134131
# {{ inspector_inspection_timeout }}.
135132
#kolla_bifrost_inspection_timeout:
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
---
2+
upgrade:
3+
- |
4+
Removes the Bifrost introspection rule that was updating the deploy kernel
5+
location from the legacy ``ipa.vmlinuz`` path to the new ``ipa.kernel``
6+
path. If this migration has not yet been applied, update the deployment
7+
kernel location manually with:
8+
9+
``OS_CLOUD=bifrost baremetal node set --driver-info deploy_kernel=<http://url/to/ipa.kernel> $NODE_UUID_OR_NAME``
10+
11+
This is only relevant for deployments with nodes discovered with the
12+
OpenStack Train release or earlier.

0 commit comments

Comments
 (0)