From d539efc94fdd2486e8fe7c08bddbbf6c843301e6 Mon Sep 17 00:00:00 2001
From: Maksim Malchuk <maksim.malchuk@gmail.com>
Date: Wed, 17 Apr 2024 22:29:07 +0300
Subject: [PATCH] Fix default place for Ubuntu Apt keyrings
The Ansible openstack.kolla collection already uses [1,2]
the recommended location [3] for the Ubuntu Apt keyrings,
so lets fix this in Kayobe too.
[1] https://opendev.org/openstack/ansible-collection-kolla/src/branch/master/roles/docker/tasks/repo-Debian.yml#L21
[2] https://opendev.org/openstack/ansible-collection-kolla/src/branch/master/roles/podman_sdk/tasks/main.yml#L13
[3] https://manpages.ubuntu.com/manpages/jammy/en/man8/apt-key.8.html#deprecation
Change-Id: I4901294c8f5912cb35df3866ed13012461b4f644
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
---
ansible/roles/apt/defaults/main.yml | 2 +-
.../notes/fix-apt-keyrings-location-28ea144738de54a7.yaml | 5 +++++
2 files changed, 6 insertions(+), 1 deletion(-)
create mode 100644 releasenotes/notes/fix-apt-keyrings-location-28ea144738de54a7.yaml
diff --git a/ansible/roles/apt/defaults/main.yml b/ansible/roles/apt/defaults/main.yml
index de6c4142..b20e2a17 100644
--- a/ansible/roles/apt/defaults/main.yml
+++ b/ansible/roles/apt/defaults/main.yml
@@ -20,7 +20,7 @@ apt_proxy_https: "{{ apt_proxy_http }}"
apt_config: []
# Directory containing GPG keyrings for apt repos.
-apt_keys_path: "/usr/local/share/keyrings"
+apt_keys_path: "/etc/apt/keyrings"
# List of apt keys. Each item is a dict containing the following keys:
# * url: URL of key
diff --git a/releasenotes/notes/fix-apt-keyrings-location-28ea144738de54a7.yaml b/releasenotes/notes/fix-apt-keyrings-location-28ea144738de54a7.yaml
new file mode 100644
index 00000000..bd2ff30a
--- /dev/null
+++ b/releasenotes/notes/fix-apt-keyrings-location-28ea144738de54a7.yaml
@@ -0,0 +1,5 @@
+---
+fixes:
+ - |
+ Fixes default Ubuntu Apt keyrings location to the recommended
+ ``/etc/apt/keyrings``.
--
GitLab