diff --git a/docker/base/httpd_setup.sh b/docker/base/httpd_setup.sh index eb3d6794e9..35f7b5b1e3 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/docker/letsencrypt/letsencrypt-base/Dockerfile.j2 b/docker/letsencrypt/letsencrypt-base/Dockerfile.j2 index 022ff2bfa3..70efa89087 100644 --- a/docker/letsencrypt/letsencrypt-base/Dockerfile.j2 +++ b/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 %} diff --git a/releasenotes/notes/configure-apache-locale-d0150e5881f00e65.yaml b/releasenotes/notes/configure-apache-locale-d0150e5881f00e65.yaml new file mode 100644 index 0000000000..ca7f9d9107 --- /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 `__