openstack/kayobe
Code Issues Proposed changes

Fix default place for Ubuntu Apt keyrings

Browse Source 
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>
This commit is contained in:
Maksim Malchuk 2024-04-17 22:29:07 +03:00
parent ece51deb3b
commit d539efc94f
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/apt/defaults/main.yml
View File

@ -20,7 +20,7 @@ apt_proxy_https: "{{ apt_proxy_http }}"
apt_config: [] apt_config: []
# Directory containing GPG keyrings for apt repos. # 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: # List of apt keys. Each item is a dict containing the following keys:
# * url: URL of key # * url: URL of key

5
releasenotes/notes/fix-apt-keyrings-location-28ea144738de54a7.yaml Normal file
View File

@ -0,0 +1,5 @@
---
fixes:
- |
Fixes default Ubuntu Apt keyrings location to the recommended
``/etc/apt/keyrings``.