Merge pull request #530 from stackhpc/upstream/2023.1-2024-02-12

Synchronise 2023.1 with upstream

Author: markgoddard

ansible/roles/nova-cell/templates/nova.conf.j2

@@ -26,7 +26,7 @@ compute_driver = libvirt.LibvirtDriver
 # Though my_ip is not used directly, lots of other variables use $my_ip
 my_ip = {{ api_interface_address }}
 
-{% if enable_ceilometer | bool or enable_designate | bool %}
+{% if enable_ceilometer | bool %}
 instance_usage_audit = True
 instance_usage_audit_period = hour
 {% if enable_watcher | bool %}

ansible/roles/nova/templates/nova.conf.j2

@@ -16,7 +16,7 @@ allow_resize_to_same_host = true
 # Though my_ip is not used directly, lots of other variables use $my_ip
 my_ip = {{ api_interface_address }}
 
-{% if enable_ceilometer | bool or enable_designate | bool %}
+{% if enable_ceilometer | bool %}
 instance_usage_audit = True
 instance_usage_audit_period = hour
 {% endif %}

doc/source/reference/storage/external-ceph-guide.rst

@@ -76,7 +76,7 @@ for Ceph includes the following steps:
    .. path /etc/kolla/config/glance.conf
    .. code-block:: ini
 
-      [GLOBAL]
+      [DEFAULT]
       show_image_direct_url = True
 
 .. warning::

releasenotes/notes/disable-usage-audit-notifications-6e63588bdcc48603.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes enabled usage audit notifications when they
+    are not needed. See `LP##2049503
+    <https://bugs.launchpad.net/kolla-ansible/+bug/2049503>`__.