diff options
| author | Zuul <zuul@review.opendev.org> | 2024-08-21 15:10:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2024-08-21 15:10:03 +0000 |
| commit | fe1aefd67fb554de81a1ba2d66c33645483fcf79 (patch) | |
| tree | 304e2a9db146c5fe374da0ced9eea1b84fe0b2ed | |
| parent | 44acae38943185a6bcc6abfad24ba87839fce28a (diff) | |
| parent | 2caa64df67349b365b5ce94a0e9625d0b6ff87d1 (diff) | |
| download | kolla-fe1aefd67fb554de81a1ba2d66c33645483fcf79.tar.gz kolla-fe1aefd67fb554de81a1ba2d66c33645483fcf79.zip | |
Merge "Configure Apache services to use correct locale"
| -rw-r--r-- | docker/base/httpd_setup.sh | 10 | ||||
| -rw-r--r-- | releasenotes/notes/configure-apache-locale-d0150e5881f00e65.yaml | 7 |
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>`__ |