You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/03/23 08:13:31 UTC

[incubator-dlab] 03/03: [DLAB-1415]: changed azure notebook images tags

This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DLAB-1415
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 0763cc21b6c76b0addc42fe9b6bc6872bc6bc509
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Mar 20 16:33:24 2020 +0200

    [DLAB-1415]: changed azure notebook images tags
---
 .../src/general/scripts/azure/common_create_notebook_image.py         | 2 +-
 .../src/general/scripts/azure/deeplearning_configure.py               | 4 ++--
 .../src/general/scripts/azure/jupyter_configure.py                    | 4 ++--
 .../src/general/scripts/azure/jupyterlab_configure.py                 | 4 ++--
 .../src/general/scripts/azure/rstudio_configure.py                    | 4 ++--
 .../src/general/scripts/azure/tensor_configure.py                     | 4 ++--
 .../src/general/scripts/azure/zeppelin_configure.py                   | 4 ++--
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/infrastructure-provisioning/src/general/scripts/azure/common_create_notebook_image.py b/infrastructure-provisioning/src/general/scripts/azure/common_create_notebook_image.py
index dbd3988..bc6fcbd 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/common_create_notebook_image.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/common_create_notebook_image.py
@@ -52,7 +52,7 @@ if __name__ == "__main__":
                                                                 image_conf['endpoint_name'],
                                                                 image_conf['application'],
                                                                 image_conf['image_name'])
-        image_conf['tags'] = {"Name": image_conf['service_base_name'],
+        image_conf['tags'] = {"Name": image_conf['instance_name'],
                               "SBN": image_conf['service_base_name'],
                               "User": image_conf['user_name'],
                               "project_tag": image_conf['project_tag'],
diff --git a/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py b/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
index 37473b7..9c8f24c 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
@@ -70,7 +70,7 @@ if __name__ == "__main__":
                 notebook_config['project_name'],
                 notebook_config['endpoint_name'],
                 os.environ['application'])
-            notebook_config['image_tags'] = {"Name": notebook_config['instance_name'],
+            notebook_config['image_tags'] = {"Name": notebook_config['expected_image_name'],
                                              "SBN": notebook_config['service_base_name'],
                                              "User": notebook_config['user_name'],
                                              "project_tag": notebook_config['project_tag'],
@@ -82,7 +82,7 @@ if __name__ == "__main__":
                 notebook_config['service_base_name'],
                 notebook_config['endpoint_name'],
                 os.environ['application'])
-            notebook_config['image_tags'] = {"Name": notebook_config['instance_name'],
+            notebook_config['image_tags'] = {"Name": notebook_config['expected_image_name'],
                                              "SBN": notebook_config['service_base_name'],
                                              "User": notebook_config['user_name'],
                                              "endpoint_tag": notebook_config['endpoint_tag'],
diff --git a/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py b/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
index f5f9168..49f9872 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
@@ -69,7 +69,7 @@ if __name__ == "__main__":
                 notebook_config['project_name'],
                 notebook_config['endpoint_name'],
                 os.environ['application'])
-            notebook_config['image_tags'] = {"Name": notebook_config['instance_name'],
+            notebook_config['image_tags'] = {"Name": notebook_config['expected_image_name'],
                                              "SBN": notebook_config['service_base_name'],
                                              "User": notebook_config['user_name'],
                                              "project_tag": notebook_config['project_tag'],
@@ -81,7 +81,7 @@ if __name__ == "__main__":
                 notebook_config['service_base_name'],
                 notebook_config['endpoint_name'],
                 os.environ['application'])
-            notebook_config['image_tags'] = {"Name": notebook_config['instance_name'],
+            notebook_config['image_tags'] = {"Name": notebook_config['expected_image_name'],
                                              "SBN": notebook_config['service_base_name'],
                                              "User": notebook_config['user_name'],
                                              "endpoint_tag": notebook_config['endpoint_tag'],
diff --git a/infrastructure-provisioning/src/general/scripts/azure/jupyterlab_configure.py b/infrastructure-provisioning/src/general/scripts/azure/jupyterlab_configure.py
index 1984360..506fdb6 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/jupyterlab_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/jupyterlab_configure.py
@@ -69,7 +69,7 @@ if __name__ == "__main__":
                 notebook_config['project_name'],
                 notebook_config['endpoint_name'],
                 os.environ['application'])
-            notebook_config['image_tags'] = {"Name": notebook_config['instance_name'],
+            notebook_config['image_tags'] = {"Name": notebook_config['shared_image_enabled'],
                                              "SBN": notebook_config['service_base_name'],
                                              "User": notebook_config['user_name'],
                                              "project_tag": notebook_config['project_tag'],
@@ -81,7 +81,7 @@ if __name__ == "__main__":
                 notebook_config['service_base_name'],
                 notebook_config['endpoint_name'],
                 os.environ['application'])
-            notebook_config['image_tags'] = {"Name": notebook_config['instance_name'],
+            notebook_config['image_tags'] = {"Name": notebook_config['shared_image_enabled'],
                                              "SBN": notebook_config['service_base_name'],
                                              "User": notebook_config['user_name'],
                                              "endpoint_tag": notebook_config['endpoint_tag'],
diff --git a/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
index c4f31fe..8487238 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
@@ -70,7 +70,7 @@ if __name__ == "__main__":
                 notebook_config['project_name'],
                 notebook_config['endpoint_name'],
                 os.environ['application'])
-            notebook_config['image_tags'] = {"Name": notebook_config['instance_name'],
+            notebook_config['image_tags'] = {"Name": notebook_config['expected_image_name'],
                                              "SBN": notebook_config['service_base_name'],
                                              "User": notebook_config['user_name'],
                                              "project_tag": notebook_config['project_tag'],
@@ -82,7 +82,7 @@ if __name__ == "__main__":
                 notebook_config['service_base_name'],
                 notebook_config['endpoint_name'],
                 os.environ['application'])
-            notebook_config['image_tags'] = {"Name": notebook_config['instance_name'],
+            notebook_config['image_tags'] = {"Name": notebook_config['expected_image_name'],
                                              "SBN": notebook_config['service_base_name'],
                                              "User": notebook_config['user_name'],
                                              "endpoint_tag": notebook_config['endpoint_tag'],
diff --git a/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py b/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
index 1c98eee..914f686 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
@@ -72,7 +72,7 @@ if __name__ == "__main__":
                 notebook_config['project_name'],
                 notebook_config['endpoint_name'],
                 os.environ['application'])
-            notebook_config['image_tags'] = {"Name": notebook_config['instance_name'],
+            notebook_config['image_tags'] = {"Name": notebook_config['expected_image_name'],
                                              "SBN": notebook_config['service_base_name'],
                                              "User": notebook_config['user_name'],
                                              "project_tag": notebook_config['project_tag'],
@@ -84,7 +84,7 @@ if __name__ == "__main__":
                 notebook_config['service_base_name'],
                 notebook_config['endpoint_name'],
                 os.environ['application'])
-            notebook_config['image_tags'] = {"Name": notebook_config['instance_name'],
+            notebook_config['image_tags'] = {"Name": notebook_config['expected_image_name'],
                                              "SBN": notebook_config['service_base_name'],
                                              "User": notebook_config['user_name'],
                                              "endpoint_tag": notebook_config['endpoint_tag'],
diff --git a/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py b/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
index d870ecc..91eb529 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
@@ -71,7 +71,7 @@ if __name__ == "__main__":
                 notebook_config['project_name'],
                 notebook_config['endpoint_name'],
                 os.environ['application'])
-            notebook_config['image_tags'] = {"Name": notebook_config['instance_name'],
+            notebook_config['image_tags'] = {"Name": notebook_config['expected_image_name'],
                                              "SBN": notebook_config['service_base_name'],
                                              "User": notebook_config['user_name'],
                                              "project_tag": notebook_config['project_tag'],
@@ -83,7 +83,7 @@ if __name__ == "__main__":
                 notebook_config['service_base_name'],
                 notebook_config['endpoint_name'],
                 os.environ['application'])
-            notebook_config['image_tags'] = {"Name": notebook_config['instance_name'],
+            notebook_config['image_tags'] = {"Name": notebook_config['expected_image_name'],
                                              "SBN": notebook_config['service_base_name'],
                                              "User": notebook_config['user_name'],
                                              "endpoint_tag": notebook_config['endpoint_tag'],


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org