This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2409
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2409 by this push:
new 527fe2c [DATALAB-2409]: returned ldap arguments to deploy_datalab.py
527fe2c is described below
commit 527fe2c27f924d5f68bbef21440beaa92dcf855b
Author: leonidfrolov <[email protected]>
AuthorDate: Wed Oct 13 10:22:06 2021 +0300
[DATALAB-2409]: returned ldap arguments to deploy_datalab.py
---
infrastructure-provisioning/scripts/deploy_datalab.py | 7 +++++++
infrastructure-provisioning/src/ssn/scripts/configure_ui.py | 4 ----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_datalab.py
b/infrastructure-provisioning/scripts/deploy_datalab.py
index 9eb0357..44fbef5 100644
--- a/infrastructure-provisioning/scripts/deploy_datalab.py
+++ b/infrastructure-provisioning/scripts/deploy_datalab.py
@@ -153,6 +153,13 @@ def build_parser():
help='Keycloak client name')
parser.add_argument('--keycloak_client_secret', type=str,
default='datalab',
help='Keycloak client secret')
+ parser.add_argument('--ldap_hostname', type=str, default='localhost',
help='Ldap instance hostname')
+ parser.add_argument('--ldap_dn', type=str, default='dc=example,dc=com',
+ help='Ldap distinguished name')
+ parser.add_argument('--ldap_ou', type=str, default='ou=People', help='Ldap
organisation unit')
+ parser.add_argument('--ldap_service_username', type=str,
default='cn=service-user', help='Ldap service user name')
+ parser.add_argument('--ldap_service_password', type=str,
default='service-user-password',
+ help='Ldap password for admin user')
required_args = parser.add_argument_group('Required arguments')
required_args.add_argument('--conf_service_base_name', type=str,
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
index 6a9d41f..4a4476e 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
@@ -90,7 +90,6 @@ logging.basicConfig(format='%(levelname)-8s [%(asctime)s]
%(message)s',
mongo_passwd = id_generator()
keystore_passwd = id_generator()
-<<<<<<< HEAD
def copy_ssn_libraries():
try:
@@ -107,9 +106,6 @@ def copy_ssn_libraries():
print('Failed to copy ssn libraries: ', str(err))
sys.exit(1)
-
-=======
->>>>>>> 65a389ea3... [DATALAB-2409]: changed when datalab python libs are
copied
def configure_mongo(mongo_passwd, default_endpoint_name):
try:
if not exists(conn,"/lib/systemd/system/mongod.service"):
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
