Skip to content

Commit

Permalink
Update Azure udev rules workaround for WALinuxAgent
Browse files Browse the repository at this point in the history
For RHEL 8.6, we no longer need the 25rhcos-azure-udev-rules overlay
because the WALinuxAgent-udev package exists. We do still need the glue
code that copies the udev files into the initramfs via a dracut module,
thought. This is not needed for RHEL 9.0.

This migrates the glue code that installs the udev rules into the
initramfs to an overlay module in the RHCOS repo for 8.6. It was no
longer needed in FCOS and removed from the overlay there in [1].

[1] coreos/fedora-coreos-config#1686

From: #785
  • Loading branch information
travier committed May 24, 2022
1 parent 9b42a6d commit 7a22c54
Show file tree
Hide file tree
Showing 6 changed files with 32 additions and 14 deletions.
1 change: 0 additions & 1 deletion common.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ ostree-layers:
- overlay/15rhcos-tuned-bits
- overlay/20platform-chrony
- overlay/21dhcp-chrony
- overlay/25rhcos-azure-udev-rules

arch-include:
x86_64:
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
#!/bin/bash
# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
# ex: ts=8 sw=4 sts=4 et filetype=sh

# We want to provide Azure udev rules as part of the initrd, so that Ignition
# is able to detect disks and act on them.
#
# The WALinuxAgent-udev has been changed to install udev rules into
# the initramfs [1], but that change isn't in el8 yet. This can be
# dropped when moving to el9.
#
# [1] https://src.fedoraproject.org/rpms/WALinuxAgent/c/521b67bc8575f53a30b4b2c4e63292e67483a4e1?branch=rawhide

install() {
inst_multiple \
/usr/lib/udev/rules.d/66-azure-storage.rules \
/usr/lib/udev/rules.d/99-azure-product-uuid.rules
}
12 changes: 12 additions & 0 deletions overlay.d/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,20 @@ https://listengine.tuxfamily.org/chrony.tuxfamily.org/chrony-dev/2020/05/msg0002
25rhcos-azure-udev-rules
------------------------

RHEL 8.5 only

Ships udev rules for Azure. This works in tandem with the
`25coreos-azure-udev` dracut module in 05core which ships
them in the initramfs. In the future, we should be able to
drop this overlay and instead ship `WALinuxAgent-udev` as we
do in FCOS (https://bugzilla.redhat.com/show_bug.cgi?id=1913074).

25rhcos-azure-udev
-------------

RHEL 8.6 only

We want to provide Azure udev rules as part of the initrd, so that Ignition is
able to detect disks and act on them. The WALinuxAgent-udev has been changed to
install udev rules into the initramfs, but that change isn't in el8 yet. This
can be dropped when moving to el9.
1 change: 1 addition & 0 deletions rhel-8.5.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
ostree-layers:
# Temporary logrotate service and timer units
- overlay/15rhcos-logrotate
- overlay/25rhcos-azure-udev-rules

# See README.md
# and https://github.com/openshift/release/blob/master/core-services/release-controller/README.md#rpm-mirrors
Expand Down
1 change: 1 addition & 0 deletions rhel-8.6.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
ostree-layers:
# Temporary logrotate service and timer units
- overlay/15rhcos-logrotate
- overlay/25rhcos-azure-udev

# See README.md
# and https://github.com/openshift/release/blob/master/core-services/release-controller/README.md#rpm-mirrors
Expand Down
13 changes: 0 additions & 13 deletions tests/kola/version/drop-azure-ptp

This file was deleted.

0 comments on commit 7a22c54

Please sign in to comment.