Skip to content

Commit b6cb60e

Browse files
authored
Merge pull request #341 from stackhpc/upstream/2023.1-2024-09-02
Synchronise 2023.1 with upstream
2 parents c6af9eb + 0d55fe0 commit b6cb60e

File tree

3 files changed

+17
-3
lines changed

3 files changed

+17
-3
lines changed

.zuul.d/centos.yaml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@
44
jobs:
55
- kolla-build-centos9s
66
- kolla-ansible-centos9s
7-
check-arm64:
8-
jobs:
9-
- kolla-build-centos9s-aarch64
107
experimental:
118
jobs:
129
- kolla-build-no-infra-wheels-centos9s

docker/base/httpd_setup.sh

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,3 +39,13 @@ EOF
3939
/usr/libexec/httpd-ssl-gencerts
4040
fi
4141
fi
42+
43+
# The default system locale with unicode support
44+
LANG=C.UTF-8
45+
46+
# Override the default locale if configured
47+
if [[ "${KOLLA_BASE_DISTRO}" =~ debian|ubuntu ]]; then
48+
[ -f /etc/default/locale ] && . /etc/default/locale
49+
else
50+
[ -f /etc/locale.conf ] && . /etc/locale.conf
51+
fi
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
---
2+
fixes:
3+
- |
4+
Apache services like Keystone now started with correct unicode locale.
5+
Keystone under Apache on Ubuntu will fail with a UnicodeEncodeError
6+
when LDAP driver and DEBUG are enabled.
7+
`LP#2076453 <https://bugs.launchpad.net/kolla/+bug/2076453>`__

0 commit comments

Comments
 (0)