Merge pull request #102 from rtripath89/feat_bright_8.2

Feat bright 8.2

prod_rmq_agents/get-next-uid-gid.py

@@ -36,7 +36,7 @@ def create_account(msg):
 
     # Bright command to create user
     cmd = "/cm/local/apps/cmd/bin/cmsh -c "
-    cmd += f'"user; add {username}; set id {uid}; set email {email}; set commonname \\"{fullname}\\"; '
+    cmd += f'"user; add {username}; set userid {uid}; set email {email}; set commonname \\"{fullname}\\"; '
     cmd += 'commit;"'
 
     if not args.dry_run:

prod_rmq_agents/git_commit.py

@@ -61,26 +61,26 @@ def git_commit(ch, method, properties, body):
                 group_ldif, "w"
             ) as ldif_g:
                 logger.debug(
-                    f"ldapsearch -LLL -x -H ldaps://ldapserver -b 'dc=cm,dc=cluster' uid={username} > {user_ldif}"
+                    f"ldapsearch -LLL -x -h ldapserver -b 'dc=cm,dc=cluster' uid={username} > {user_ldif}"
                 )
                 ldapsearch(
                     "-LLL",
                     "-x",
-                    "-H",
-                    "ldaps://ldapserver",
+                    "-h",
+                    "ldapserver",
                     "-b",
                     "dc=cm,dc=cluster",
                     f"uid={username}",
                     _out=ldif_u,
                 )
                 logger.debug(
-                    f"ldapsearch -LLL -x -H ldapserver -b 'ou=Group,dc=cm,dc=cluster' cn={username} > {group_ldif}"
+                    f"ldapsearch -LLL -x -h ldapserver -b 'ou=Group,dc=cm,dc=cluster' cn={username} > {group_ldif}"
                 )
                 ldapsearch(
                     "-LLL",
                     "-x",
-                    "-H",
-                    "ldaps://ldapserver",
+                    "-h",
+                    "ldapserver",
                     "-b",
                     "ou=Group,dc=cm,dc=cluster",
                     f"cn={username}",