Merge pull request #338 from stackhpc/upstream/yoga-2024-09-02

Synchronise yoga with upstream
stackhpc · Sep 5, 2024 · 6aca074 · 6aca074
2 parents c3b64f4 + 09fa1b6
commit 6aca074
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 0 deletions.
diff --git a/docker/base/httpd_setup.sh b/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
diff --git a/releasenotes/notes/configure-apache-locale-d0150e5881f00e65.yaml b/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>`__