Merge pull request #115 from Percona-Lab/PBM_fix_LDAP

PBM fix LDAP group

Author: olexandr-havryliak

pmm_psmdb_diffauth_setup/docker-compose-pmm-psmdb.yml

@@ -76,7 +76,7 @@ services:
   ldap-server:
     container_name: ldap-server
     hostname: ldap-server
-    image: bitnami/openldap:2
+    image: bitnami/openldap
     environment:
       - LDAP_ADMIN_USERNAME=admin
       - LDAP_ADMIN_PASSWORD=adminpassword

pmm_psmdb_diffauth_setup/init/setup_psmdb.js

@@ -26,7 +26,7 @@ db.getSiblingDB("admin").createRole({
     roles:[]
 });
 db.getSiblingDB("admin").createRole({
-     role: "cn=readers,ou=users,dc=example,dc=org",
+     role: "cn=readers,ou=groups,dc=example,dc=org",
      privileges: [],
      roles: [
        { role: "explainRole", db: "admin" },

pmm_psmdb_diffauth_setup/test-auth.sh

@@ -37,6 +37,7 @@ cat pki/private/pmm-test.key pki/issued/pmm-test.crt > certs/client.pem
 find certs -type f -exec chmod 644 {} \;
 
 #Start setup
+docker compose -f docker-compose-pmm-psmdb.yml down -v --remove-orphans
 docker compose -f docker-compose-pmm-psmdb.yml build
 docker compose -f docker-compose-pmm-psmdb.yml up -d
 
@@ -68,7 +69,7 @@ done
 tests=${TESTS:-yes}
 if [ $tests = "yes" ]; then
     echo "running tests"
-    output=$(docker compose -f docker-compose-pmm-psmdb.yml run test pytest -s -x --verbose test.py)
+    output=$(docker compose -f docker-compose-pmm-psmdb.yml run test pytest -s --verbose test.py)
     else
     echo "skipping tests"
 fi