You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2021/10/12 13:29:18 UTC
[incubator-datalab] branch DATALAB-2409 updated: [DATALAB-2409]:
changed when datalab python libs are copied
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 65a389e [DATALAB-2409]: changed when datalab python libs are copied
65a389e is described below
commit 65a389ea3e20c558eca3d06b28a05977b58834c6
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Tue Oct 12 16:29:11 2021 +0300
[DATALAB-2409]: changed when datalab python libs are copied
---
.../scripts/deploy_datalab.py | 8 ++++----
.../src/ssn/scripts/configure_ssn_node.py | 21 +++++++++++++++++++++
.../src/ssn/scripts/configure_ui.py | 20 --------------------
3 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_datalab.py b/infrastructure-provisioning/scripts/deploy_datalab.py
index 22d7b7d..9eb0357 100644
--- a/infrastructure-provisioning/scripts/deploy_datalab.py
+++ b/infrastructure-provisioning/scripts/deploy_datalab.py
@@ -149,6 +149,10 @@ def build_parser():
help='true if download jars from repository')
parser.add_argument('--default_endpoint_name', type=str, default='local',
help='Name of localhost provisioning service, that created by default')
+ parser.add_argument('--keycloak_client_name', type=str, default='datalab',
+ help='Keycloak client name')
+ parser.add_argument('--keycloak_client_secret', type=str, default='datalab',
+ help='Keycloak client secret')
required_args = parser.add_argument_group('Required arguments')
required_args.add_argument('--conf_service_base_name', type=str,
@@ -160,10 +164,6 @@ def build_parser():
required_args.add_argument('--keycloak_auth_server_url', type=str, default='datalab',
help='Keycloak auth server URL', required=True)
required_args.add_argument('--keycloak_realm_name', type=str, help='Keycloak Realm name', required=True)
- required_args.add_argument('--keycloak_client_name', type=str, default='datalab',
- help='Keycloak client name')
- required_args.add_argument('--keycloak_client_secret', type=str, default='datalab',
- help='Keycloak client secret')
required_args.add_argument('--keycloak_user', type=str, default='datalab', help='Keycloak user', required=True)
required_args.add_argument('--keycloak_user_password', type=str, default='keycloak-user-password',
help='Keycloak user password', required=True)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
index a4d1ef3..66bb50b 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
@@ -205,6 +205,24 @@ def docker_build_script():
logging.error('Failed to configure docker_build script: ', str(err))
sys.exit(1)
+
+def copy_ssn_libraries():
+ try:
+ conn.sudo('mkdir -p /usr/lib/python3.8/datalab/')
+ conn.run('mkdir -p /tmp/datalab_libs/')
+ subprocess.run(
+ 'scp -i {} /usr/lib/python3.8/datalab/*.py {}:/tmp/datalab_libs/'.format(args.keyfile, host_string),
+ shell=True, check=True)
+ conn.run('chmod a+x /tmp/datalab_libs/*')
+ conn.sudo('mv /tmp/datalab_libs/* /usr/lib/python3.8/datalab/')
+ if exists(conn, '/usr/lib64'):
+ conn.sudo('mkdir -p /usr/lib64/python3.8')
+ conn.sudo('ln -fs /usr/lib/python3.8/datalab /usr/lib64/python3.8/datalab')
+ except Exception as err:
+ traceback.print_exc()
+ logging.error('Failed to copy ssn libraries: ', str(err))
+ sys.exit(1)
+
##############
# Run script #
##############
@@ -282,4 +300,7 @@ if __name__ == "__main__":
logging.info("Configuring docker_build script")
docker_build_script()
+ logging.info("Copying DataLab libraries to SSN")
+ copy_ssn_libraries()
+
conn.close()
\ No newline at end of file
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
index db05276..ae67894 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
@@ -90,23 +90,6 @@ logging.basicConfig(format='%(levelname)-8s [%(asctime)s] %(message)s',
mongo_passwd = id_generator()
keystore_passwd = id_generator()
-
-def copy_ssn_libraries():
- try:
- conn.sudo('mkdir -p /usr/lib/python3.8/datalab/')
- conn.run('mkdir -p /tmp/datalab_libs/')
- subprocess.run('scp -i {} /usr/lib/python3.8/datalab/*.py {}:/tmp/datalab_libs/'.format(args.keyfile, host_string), shell=True, check=True)
- conn.run('chmod a+x /tmp/datalab_libs/*')
- conn.sudo('mv /tmp/datalab_libs/* /usr/lib/python3.8/datalab/')
- if exists(conn, '/usr/lib64'):
- conn.sudo('mkdir -p /usr/lib64/python3.8')
- conn.sudo('ln -fs /usr/lib/python3.8/datalab /usr/lib64/python3.8/datalab')
- except Exception as err:
- traceback.print_exc()
- logging.error('Failed to copy ssn libraries: ', str(err))
- sys.exit(1)
-
-
def configure_mongo(mongo_passwd, default_endpoint_name):
try:
if not exists(conn,"/lib/systemd/system/mongod.service"):
@@ -230,9 +213,6 @@ if __name__ == "__main__":
except:
sys.exit(2)
- logging.info("Copying DataLab libraries to SSN")
- copy_ssn_libraries()
-
logging.info("Installing Supervisor")
ensure_supervisor()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org