commit a5e8d5c196195969e2ccd7167cf440ea6796552b
author Ivan Berezovskiy <iberezovskiy@mirantis.com> Thu Feb 28 19:59:47 2019 +0400
committer Ivan Berezovskiy <iberezovskiy@mirantis.com> Fri Mar 01 11:55:24 2019 +0000
tree 01e685e87ccf9c7b6d49d8880e972041292e4fe7
parent dcae76860810b515025e4e86276f80e318e6f668

Fix issue with unencrypted openldap admin password

Change-Id: Ia19865ba5546165ef4b70920326a280af9c9ecb9
Related-prod: #PROD-28067 (PROD:28067)
(cherry picked from commit 64a63be47a8756e6119f9a6000d152b7f5c7030d)

docker/swarm/stack/ldap.yml

diff --git a/docker/swarm/stack/ldap.yml b/docker/swarm/stack/ldap.yml
index fbb74bc..b785711 100644
--- a/docker/swarm/stack/ldap.yml
+++ b/docker/swarm/stack/ldap.yml
@@ -39,7 +39,8 @@
                 - server
               hostname: ldap
               environment:
-                PHPLDAPADMIN_LDAP_HOSTS: "#PYTHON2BASH:[{'server': [{'server': [{'tls': False}]},{'login': [{'bind_id': 'cn=admin,${_param:openldap_dn}'},{'bind_pass': '${_param:openldap_admin_password}'}]}]}]"
+                PHPLDAPADMIN_LDAP_ADMIN_PASSWORD: ${_param:openldap_admin_password}
+                PHPLDAPADMIN_LDAP_HOSTS: "#PYTHON2BASH:[{'server': [{'server': [{'tls': False}]},{'login': [{'bind_id': 'cn=admin,${_param:openldap_dn}'},{'bind_pass': '$PHPLDAPADMIN_LDAP_ADMIN_PASSWORD'}]}]}]"
                 PHPLDAPADMIN_HTTPS: "false"
                 PHPLDAPADMIN_TRUST_PROXY_SSL: "true"
                 PHPLDAPADMIN_SERVER_ADMIN: ${_param:admin_email}