2a13f189be
Resolves: RHEL-58465 - package rhel-system-roles.noarch does not provide docs for ansible-doc [rhel-8.10.z] Resolves: RHEL-58494 ad_integration - fix: Sets domain name lower case in realmd.conf section header [rhel-8.10.z] Resolves: RHEL-58917 bootloader - bootloader role tests do not work on ostree [rhel-8.10.z] Resolves: RHEL-45711 bootloader - fix: Set user.cfg path to /boot/grub2/ on EL 9 UEFI [rhel-8] Resolves: RHEL-58515 cockpit - cockpit install all wildcard match does not work in newer el9 [rhel-8.10.z] Resolves: RHEL-58485 logging - RFE - system-roles - logging: Add truncate options for local file inputs [rhel-8.10.z] Resolves: RHEL-58481 logging - redhat.rhel_system_roles.logging role fails to process logging_outputs: of type: "custom" [rhel-8.10.z] Resolves: RHEL-58477 logging - [RFE] Add the umask settings or enable a variable in linux-system-roles.logging [rhel-8.10.z] Resolves: RHEL-37550 logging - Setup imuxsock using rhel-system-roles.logging causing an error EL8 Resolves: RHEL-58519 nbde_client - feat: Allow initrd configuration to be skipped [rhel-8.10.z] Resolves: RHEL-58525 podman - fix: proper cleanup for networks; ensure cleanup of resources [rhel-8.10.z] Resolves: RHEL-58511 podman - fix: grab name of network to remove from quadlet file [rhel-8.10.z] Resolves: RHEL-58507 podman - Create podman secret when skip_existing=True and it does not exist [rhel-8.10.z] Resolves: RHEL-58503 podman - fix: do not use become for changing hostdir ownership, and expose subuid/subgid info [rhel-8.10.z] Resolves: RHEL-58498 podman - fix: use correct user for cancel linger file name [rhel-8.10.z] Resolves: RHEL-58460 podman - redhat.rhel_system_roles.podman fails to configure and run containers with podman rootless using different username and groupname. [rhel-8.10.z] Resolves: RHEL-58473 sshd - second SSHD service broken [rhel-8.10.z] Resolves: RHEL-58469 storage - rhel-system-role.storage is not idempotent [rhel-8.10.z] Resolves: RHEL-58489 timesync - System Roles: No module documentation [rhel-8.10.z] (cherry picked from commit 350d523452546e35bb0805af9ad9cc74712899d7)
57 lines
1.8 KiB
Diff
57 lines
1.8 KiB
Diff
From 53f83475c59092e2c23d1957c2fc24c8ca4b6ad9 Mon Sep 17 00:00:00 2001
|
|
From: Rich Megginson <rmeggins@redhat.com>
|
|
Date: Tue, 9 Apr 2024 18:27:25 -0600
|
|
Subject: [PATCH 102/115] fix: use correct user for cancel linger file name
|
|
|
|
Cause: When processing a list of kube or quadlet items, the
|
|
code was using the user id associated with the list, not the
|
|
item, to specify the linger filename.
|
|
|
|
Consequence: The linger file does not exist, so the code
|
|
does not cancel linger for the actual user.
|
|
|
|
Fix: Use the correct username to construct the linger filename.
|
|
|
|
Result: Lingering is cancelled for the correct users.
|
|
|
|
QE: The test is now in tests_basic.yml
|
|
|
|
Signed-off-by: Rich Megginson <rmeggins@redhat.com>
|
|
(cherry picked from commit 67b88b9aa0a1b1123c2ae24bb7ca4a527924cd13)
|
|
---
|
|
tasks/cancel_linger.yml | 2 +-
|
|
tests/tests_basic.yml | 7 +++++++
|
|
2 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/tasks/cancel_linger.yml b/tasks/cancel_linger.yml
|
|
index 761778b..ede71fe 100644
|
|
--- a/tasks/cancel_linger.yml
|
|
+++ b/tasks/cancel_linger.yml
|
|
@@ -59,4 +59,4 @@
|
|
- __podman_linger_secrets.stdout == ""
|
|
changed_when: true
|
|
args:
|
|
- removes: /var/lib/systemd/linger/{{ __podman_user }}
|
|
+ removes: /var/lib/systemd/linger/{{ __podman_linger_user }}
|
|
diff --git a/tests/tests_basic.yml b/tests/tests_basic.yml
|
|
index a9f01c9..d4f9238 100644
|
|
--- a/tests/tests_basic.yml
|
|
+++ b/tests/tests_basic.yml
|
|
@@ -409,6 +409,13 @@
|
|
^[ ]*podman-kube@.+-{{ item[0] }}[.]yml[.]service[ ]+loaded[
|
|
]+active
|
|
|
|
+ - name: Ensure no linger
|
|
+ stat:
|
|
+ path: /var/lib/systemd/linger/{{ item[1] }}
|
|
+ loop: "{{ test_names_users }}"
|
|
+ register: __stat
|
|
+ failed_when: __stat.stat.exists
|
|
+
|
|
rescue:
|
|
- name: Dump journal
|
|
command: journalctl -ex
|
|
--
|
|
2.46.0
|
|
|