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/04/08 07:04:19 UTC
[incubator-datalab] branch DATALAB-2091 updated (32f1a27 -> 61c02eb)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
from 32f1a27 [DATALAB-2091]: fixed function name
new de56164 [DATALAB-2091]: added import of replace_multi_symbols in common_create_git_certfile
new a621158 [DATALAB-2091]: specified which functions to import
new 61c02eb [DATALAB-2091]: fixed post configuration failure
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/general/scripts/aws/common_download_git_certfile.py | 1 +
.../src/general/scripts/aws/common_remove_remote_kernels.py | 6 +++---
.../src/general/scripts/aws/deeplearning_configure.py | 2 +-
.../src/general/scripts/aws/jupyter_configure.py | 2 +-
.../src/general/scripts/aws/jupyterlab_configure.py | 2 +-
.../src/general/scripts/aws/rstudio_configure.py | 2 +-
.../src/general/scripts/aws/tensor-rstudio_configure.py | 2 +-
.../src/general/scripts/aws/tensor_configure.py | 2 +-
.../src/general/scripts/aws/zeppelin_configure.py | 2 +-
.../src/general/scripts/azure/deeplearning_configure.py | 2 +-
.../src/general/scripts/azure/jupyter_configure.py | 2 +-
.../src/general/scripts/azure/rstudio_configure.py | 2 +-
.../src/general/scripts/azure/tensor_configure.py | 2 +-
.../src/general/scripts/azure/zeppelin_configure.py | 2 +-
14 files changed, 16 insertions(+), 15 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 02/03: [DATALAB-2091]: specified which
functions to import
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit a621158486081ab27aa54ac27a40cde5d097aa3c
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Apr 8 10:02:55 2021 +0300
[DATALAB-2091]: specified which functions to import
---
.../src/general/scripts/aws/common_remove_remote_kernels.py | 6 +++---
.../src/general/scripts/aws/rstudio_configure.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_remove_remote_kernels.py b/infrastructure-provisioning/src/general/scripts/aws/common_remove_remote_kernels.py
index c9a08e2..f903a92 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/common_remove_remote_kernels.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/common_remove_remote_kernels.py
@@ -23,8 +23,8 @@
import argparse
import sys
-from datalab.actions_lib import *
-from datalab.fab import *
+from datalab.actions_lib import remove_dataengine_kernels, remove_kernels
+from datalab.fab import init_datalab_connection, find_cluster_kernels
from fabric import *
parser = argparse.ArgumentParser()
@@ -39,7 +39,7 @@ args = parser.parse_args()
if __name__ == "__main__":
print('Configure connections')
global conn
- conn = datalab.fab.init_datalab_connection(args.hostname, args.os_user, args.keyfile)
+ conn = init_datalab_connection(args.hostname, args.os_user, args.keyfile)
try:
de_clusters, des_clusters = find_cluster_kernels()
diff --git a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
index 70e5e2c..3ad6aca 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
@@ -223,7 +223,7 @@ if __name__ == "__main__":
try:
logging.info('[POST CONFIGURING PROCESS]')
print('[POST CONFIGURING PROCESS')
- if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None']:
+ if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None', '']:
params = "--hostname {} --keyfile {} --os_user {} --nb_tag_name {} --nb_tag_value {}" \
.format(instance_hostname, keyfile_name, notebook_config['datalab_ssh_user'],
notebook_config['tag_name'], notebook_config['instance_name'])
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/03: [DATALAB-2091]: added import of
replace_multi_symbols in common_create_git_certfile
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit de56164769311477db38f1ccd7b3f8551aad95b0
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Apr 7 12:13:54 2021 +0300
[DATALAB-2091]: added import of replace_multi_symbols in common_create_git_certfile
---
.../src/general/scripts/aws/common_download_git_certfile.py | 1 +
1 file changed, 1 insertion(+)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_download_git_certfile.py b/infrastructure-provisioning/src/general/scripts/aws/common_download_git_certfile.py
index 2acd040..535ac06 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/common_download_git_certfile.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/common_download_git_certfile.py
@@ -25,6 +25,7 @@ import argparse
import os
from datalab.actions_lib import *
from fabric import *
+from datalab.fab import replace_multi_symbols
parser = argparse.ArgumentParser()
parser.add_argument('--keyfile', type=str, default='')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 03/03: [DATALAB-2091]: fixed post configuration
failure
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 61c02eb542072b2737abe7de4849ad235fde0e4e
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Apr 8 10:04:04 2021 +0300
[DATALAB-2091]: fixed post configuration failure
---
.../src/general/scripts/aws/deeplearning_configure.py | 2 +-
.../src/general/scripts/aws/jupyter_configure.py | 2 +-
.../src/general/scripts/aws/jupyterlab_configure.py | 2 +-
.../src/general/scripts/aws/tensor-rstudio_configure.py | 2 +-
infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py | 2 +-
.../src/general/scripts/aws/zeppelin_configure.py | 2 +-
.../src/general/scripts/azure/deeplearning_configure.py | 2 +-
.../src/general/scripts/azure/jupyter_configure.py | 2 +-
.../src/general/scripts/azure/rstudio_configure.py | 2 +-
.../src/general/scripts/azure/tensor_configure.py | 2 +-
.../src/general/scripts/azure/zeppelin_configure.py | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
index 03424dc..3b578e5 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
@@ -221,7 +221,7 @@ if __name__ == "__main__":
try:
logging.info('[POST CONFIGURING PROCESS]')
print('[POST CONFIGURING PROCESS')
- if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None']:
+ if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None', '']:
params = "--hostname {} --keyfile {} --os_user {} --nb_tag_name {} --nb_tag_value {}" \
.format(instance_hostname, keyfile_name, notebook_config['datalab_ssh_user'],
notebook_config['tag_name'], notebook_config['instance_name'])
diff --git a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
index 7805519..b040f03 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
@@ -235,7 +235,7 @@ if __name__ == "__main__":
try:
logging.info('[POST CONFIGURING PROCESS]')
print('[POST CONFIGURING PROCESS')
- if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None']:
+ if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None', '']:
params = "--hostname {} --keyfile {} --os_user {} --nb_tag_name {} --nb_tag_value {}" \
.format(instance_hostname, keyfile_name, notebook_config['datalab_ssh_user'],
notebook_config['tag_name'], notebook_config['instance_name'])
diff --git a/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py b/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
index 2e1a366..425c08d 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
@@ -234,7 +234,7 @@ if __name__ == "__main__":
try:
logging.info('[POST CONFIGURING PROCESS]')
print('[POST CONFIGURING PROCESS')
- if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None']:
+ if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None', '']:
params = "--hostname {} --keyfile {} --os_user {} --nb_tag_name {} --nb_tag_value {}" \
.format(instance_hostname, keyfile_name, notebook_config['datalab_ssh_user'],
notebook_config['tag_name'], notebook_config['instance_name'])
diff --git a/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
index d4c0197..46fdeb7 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
@@ -222,7 +222,7 @@ if __name__ == "__main__":
try:
logging.info('[POST CONFIGURING PROCESS]')
print('[POST CONFIGURING PROCESS')
- if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None']:
+ if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None', '']:
params = "--hostname {} --keyfile {} --os_user {} --nb_tag_name {} --nb_tag_value {}" \
.format(instance_hostname, keyfile_name, notebook_config['datalab_ssh_user'],
notebook_config['tag_name'], notebook_config['instance_name'])
diff --git a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
index c52ce58..a77ce0f 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
@@ -218,7 +218,7 @@ if __name__ == "__main__":
try:
logging.info('[POST CONFIGURING PROCESS]')
print('[POST CONFIGURING PROCESS')
- if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None']:
+ if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None', '']:
params = "--hostname {} --keyfile {} --os_user {} --nb_tag_name {} --nb_tag_value {}" \
.format(instance_hostname, keyfile_name, notebook_config['datalab_ssh_user'],
notebook_config['tag_name'], notebook_config['instance_name'])
diff --git a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
index ec5d080..3e86490 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
@@ -242,7 +242,7 @@ if __name__ == "__main__":
try:
logging.info('[POST CONFIGURING PROCESS]')
print('[POST CONFIGURING PROCESS')
- if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None']:
+ if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None', '']:
params = "--hostname {} --keyfile {} --os_user {} --nb_tag_name {} --nb_tag_value {}" \
.format(instance_hostname, keyfile_name, notebook_config['datalab_ssh_user'],
notebook_config['tag_name'], notebook_config['instance_name'])
diff --git a/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py b/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
index 4a1cb0c..88a2864 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
@@ -245,7 +245,7 @@ if __name__ == "__main__":
try:
logging.info('[POST CONFIGURING PROCESS]')
print('[POST CONFIGURING PROCESS')
- if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None']:
+ if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None', '']:
params = "--hostname {} --keyfile {} --os_user {} --resource_group_name {} --notebook_name {}" \
.format(instance_hostname, keyfile_name, notebook_config['datalab_ssh_user'],
notebook_config['resource_group_name'], notebook_config['instance_name'])
diff --git a/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py b/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
index b392790..2e939b9 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
@@ -246,7 +246,7 @@ if __name__ == "__main__":
try:
logging.info('[POST CONFIGURING PROCESS]')
print('[POST CONFIGURING PROCESS')
- if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None']:
+ if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None', '']:
params = "--hostname {} --keyfile {} --os_user {} --resource_group_name {} --notebook_name {}" \
.format(instance_hostname, keyfile_name, notebook_config['datalab_ssh_user'],
notebook_config['resource_group_name'], notebook_config['instance_name'])
diff --git a/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
index 7bc02e6..4ed3ad7 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
@@ -245,7 +245,7 @@ if __name__ == "__main__":
try:
logging.info('[POST CONFIGURING PROCESS]')
print('[POST CONFIGURING PROCESS')
- if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None']:
+ if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None', '']:
params = "--hostname {} --keyfile {} --os_user {} --resource_group_name {} --notebook_name {}" \
.format(instance_hostname, keyfile_name, notebook_config['datalab_ssh_user'],
notebook_config['resource_group_name'], notebook_config['instance_name'])
diff --git a/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py b/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
index 70821e8..137f355 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
@@ -243,7 +243,7 @@ if __name__ == "__main__":
try:
logging.info('[POST CONFIGURING PROCESS]')
print('[POST CONFIGURING PROCESS')
- if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None']:
+ if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None', '']:
params = "--hostname {} --keyfile {} --os_user {} --resource_group_name {} --notebook_name {}" \
.format(instance_hostname, keyfile_name, notebook_config['datalab_ssh_user'],
notebook_config['resource_group_name'], notebook_config['instance_name'])
diff --git a/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py b/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
index c505cda..b4a29b4 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
@@ -256,7 +256,7 @@ if __name__ == "__main__":
try:
logging.info('[POST CONFIGURING PROCESS]')
print('[POST CONFIGURING PROCESS')
- if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None']:
+ if notebook_config['notebook_image_name'] not in [notebook_config['expected_image_name'], 'None', '']:
params = "--hostname {} --keyfile {} --os_user {} --resource_group_name {} --notebook_name {}" \
.format(instance_hostname, keyfile_name, notebook_config['datalab_ssh_user'],
notebook_config['resource_group_name'], notebook_config['instance_name'])
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org