openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "[train-only] Add a new scheme of driver removal" into stable/train

This commit is contained in:
Zuul 2022-04-19 15:48:35 +00:00 committed by Gerrit Code Review
parent 7eea50b997 7214b535a9
commit 35360206b9
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
deployment/tripleo-packages/tripleo-packages-baremetal-puppet.yaml
View File

@ -329,9 +329,12 @@ outputs:
file:
path: "/var/lib/tripleo/workaround_1925078_fired"
state: touch
- name: install leapp
- name: install leapp and jq
package:
name: leapp
name:
- jq
- leapp
- leapp-repository
state: latest
- name: Retrieve files in /etc/leapp/files
find:
@ -403,7 +406,7 @@ outputs:
- name: unmount and remove nfs nova entry
mount: path=/var/lib/nova/instances state=absent
ignore_errors: true
- name: Remove kernel drivers from Leapp removed_drivers.txt before running Leapp
- name: "Delete the kernel modules in Leapp database (removed_drivers.txt) that are no longer supported in RHEL 8 (rhbz#1962365 < leapp-upgrade-el7toel8-0.15)"
vars:
modules_to_unload: { get_attr: [RoleParametersValue, value, 'upgrade_leapp_modules_to_unload']}
lineinfile:
@ -411,6 +414,17 @@ outputs:
regexp: "{{ item }}"
state: absent
loop: "{{ modules_to_unload }}"
- name: "Delete the kernel modules in Leapp database (device_driver_deprecation_data.json) that are no longer supported in RHEL 8 (rhbz#2064383 > leapp-upgrade-el7toel8-0.16.0)"
vars:
modules_to_unload: { get_attr: [RoleParametersValue, value, 'upgrade_leapp_modules_to_unload']}
shell: >
set -o pipefail &&
jq '. | del(.data[] | select(.driver_name == "{{ item }}"))'
/etc/leapp/files/device_driver_deprecation_data.json >
/etc/leapp/files/device_driver_deprecation_data.json_modified &&
mv /etc/leapp/files/device_driver_deprecation_data.json_modified
/etc/leapp/files/device_driver_deprecation_data.json
loop: "{{ modules_to_unload }}"
- name: Remove leapp actors to prevent them inhibiting the upgrade
vars:
actors_to_remove: { get_attr: [RoleParametersValue, value, 'upgrade_leapp_actors_to_remove']}