commit 79201026fe7db649cbcb49872d522b524098068f
author sousaedu <eduardo.sousa@canonical.com> Thu Jun 17 11:04:34 2021 +0100
committer beierlm <mark.beierl@canonical.com> Fri Jun 18 04:09:01 2021 +0200
tree 7a1619561145343e481b5c521405fc7c7623fb5a
parent 1f62f2b9a8e275d915c41443b94839e2a769f138

Fix bug 1571 - Certificate for LDAPS not written if TLS is disabled in Keystone

Change-Id: I9d4d3f96c7607c1b6f2172cb0de0a5bdcbffbfc3
Signed-off-by: sousaedu <eduardo.sousa@canonical.com>

docker/Keystone/scripts/start.sh

diff --git a/docker/Keystone/scripts/start.sh b/docker/Keystone/scripts/start.sh
index e4bb5f2..5cdeddf 100755
--- a/docker/Keystone/scripts/start.sh
+++ b/docker/Keystone/scripts/start.sh
@@ -165,6 +165,12 @@
     if [ "$LDAP_GROUP_TREE_DN" ]; then
         echo "group_tree_dn = $LDAP_GROUP_TREE_DN" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
     fi
+    if [ "$LDAP_TLS_CACERT_BASE64" ]; then
+        mkdir -p /etc/ssl/certs/
+        echo "-----BEGIN CERTIFICATE-----" >> /etc/ssl/certs/ca-certificates.crt
+        echo $LDAP_TLS_CACERT_BASE64 >> /etc/ssl/certs/ca-certificates.crt
+        echo "-----END CERTIFICATE-----" >> /etc/ssl/certs/ca-certificates.crt
+    fi
     if [ "$LDAP_USE_STARTTLS" ] && [ "$LDAP_USE_STARTTLS" == "true" ]; then
         echo "use_tls = true" >> /etc/keystone/domains/keystone.$LDAP_AUTHENTICATION_DOMAIN_NAME.conf
         mkdir -p /etc/keystone/ssl/certs/