Merge pull request #335 from stackhpc/upstream/2024.1-2024-08-26

Synchronise 2024.1 with upstream

docker/base/httpd_setup.sh

@@ -39,3 +39,13 @@ EOF
         /usr/libexec/httpd-ssl-gencerts
     fi
 fi
+
+# The default system locale with unicode support
+LANG=C.UTF-8
+
+# Override the default locale if configured
+if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
+    [ -f /etc/default/locale ] && . /etc/default/locale
+else
+    [ -f /etc/locale.conf ] && . /etc/locale.conf
+fi

docker/letsencrypt/letsencrypt-base/Dockerfile.j2

@@ -7,8 +7,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
 
 {% import "macros.j2" as macros with context %}
 
-{{ macros.install_packages(cinder_base_packages | customizable("packages")) }}
-
 COPY extend_start.sh /usr/local/bin/kolla_extend_start
 
 {% block letsencrypt_base_footer %}{% endblock %}

releasenotes/notes/configure-apache-locale-d0150e5881f00e65.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    Apache services like Keystone now started with correct unicode locale.
+    Keystone under Apache on Ubuntu will fail with a UnicodeEncodeError
+    when LDAP driver and DEBUG are enabled.
+    `LP#2076453 <https://bugs.launchpad.net/kolla/+bug/2076453>`__