summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaksim Malchuk <maksim.malchuk@gmail.com>2024-08-09 21:21:48 +0300
committerMaksim Malchuk <maksim.malchuk@gmail.com>2024-08-21 15:14:02 +0000
commitea0bfb6bc78caff014426aa690422ffea5f0dad4 (patch)
treecd141290987f82f68af34ae1ea775e30b30b6285
parent8e05ae685b5c5b3e5950fede5116cc2f46e85616 (diff)
downloadkolla-ea0bfb6bc78caff014426aa690422ffea5f0dad4.tar.gz
kolla-ea0bfb6bc78caff014426aa690422ffea5f0dad4.zip
Configure Apache services to use correct localezed-eol
Closes-Bug: #2076453 Change-Id: I6af9baf09a19a7dbcaf98585870aa44ff79398d3 Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com> (cherry picked from commit 2caa64df67349b365b5ce94a0e9625d0b6ff87d1)
-rw-r--r--docker/base/httpd_setup.sh10
-rw-r--r--releasenotes/notes/configure-apache-locale-d0150e5881f00e65.yaml7
2 files changed, 17 insertions, 0 deletions
diff --git a/docker/base/httpd_setup.sh b/docker/base/httpd_setup.sh
index eb3d6794e..35f7b5b1e 100644
--- 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
new file mode 100644
index 000000000..ca7f9d910
--- /dev/null
+++ 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>`__