Merge pull request #274 from stackhpc/upstream/2023.1-2024-05-13

Synchronise 2023.1 with upstream

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

doc/source/administration/seed.rst

@@ -113,8 +113,7 @@ Backup
 It should be safe to keep services running during the backup, but for maximum
 safety they may optionally be stopped::
 
-    docker exec -it bifrost_deploy \
-    systemctl stop ironic-api ironic-conductor ironic-inspector
+    docker exec -it bifrost_deploy systemctl stop ironic ironic-inspector
 
 Then, to perform the backup::
 
@@ -123,17 +122,15 @@ Then, to perform the backup::
 
 If the services were stopped prior to the backup, start them again::
 
-    docker exec -it bifrost_deploy \
-    systemctl start ironic-api ironic-conductor ironic-inspector
+    docker exec -it bifrost_deploy systemctl start ironic ironic-inspector
 
 Restore
 ^^^^^^^
 
 Prior to restoring the database, the Ironic and Ironic Inspector services
 should be stopped::
 
-    docker exec -it bifrost_deploy \
-    systemctl stop ironic-api ironic-conductor ironic-inspector
+    docker exec -it bifrost_deploy systemctl stop ironic ironic-inspector
 
 The database may then safely be restored::
 
@@ -142,8 +139,7 @@ The database may then safely be restored::
 
 Finally, start the Ironic and Ironic Inspector services again::
 
-    docker exec -it bifrost_deploy \
-    systemctl start ironic-api ironic-conductor ironic-inspector
+    docker exec -it bifrost_deploy systemctl start ironic ironic-inspector
 
 Running Commands
 ================

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``.