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:22 UTC
[incubator-datalab] 03/03: [DATALAB-2091]: fixed post configuration
failure
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