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

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


The following commit(s) were added to refs/heads/DLAB-1593 by this push:
     new c065f6c  [odahu-integration]: changed access links for notebooks in 
case domain name is specified
c065f6c is described below

commit c065f6c2aa022a4f92ec4aba5738c07c82cea75e
Author: leonidfrolov <[email protected]>
AuthorDate: Wed Mar 11 18:06:38 2020 +0200

    [odahu-integration]: changed access links for notebooks in case domain name 
is specified
---
 .../src/general/scripts/gcp/dataengine-service_configure.py        | 7 +++++--
 .../src/general/scripts/gcp/dataengine_configure.py                | 5 ++++-
 .../src/general/scripts/gcp/deeplearning_configure.py              | 5 ++++-
 .../src/general/scripts/gcp/jupyter_configure.py                   | 5 ++++-
 .../src/general/scripts/gcp/jupyterlab_configure.py                | 5 ++++-
 .../src/general/scripts/gcp/rstudio_configure.py                   | 5 ++++-
 .../src/general/scripts/gcp/superset_configure.py                  | 5 ++++-
 .../src/general/scripts/gcp/tensor-rstudio_configure.py            | 5 ++++-
 .../src/general/scripts/gcp/tensor_configure.py                    | 5 ++++-
 .../src/general/scripts/gcp/zeppelin_configure.py                  | 5 ++++-
 10 files changed, 41 insertions(+), 11 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
 
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
index 30f9a80..60dab3c 100644
--- 
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
@@ -165,8 +165,11 @@ if __name__ == "__main__":
     dataproc_conf['edge_instance_name'] = 
'{0}-{1}-{2}-edge'.format(dataproc_conf['service_base_name'],
                                                                     
dataproc_conf['project_name'],
                                                                     
dataproc_conf['endpoint_name'])
-    dataproc_conf['edge_instance_hostname'] = 
GCPMeta().get_instance_public_ip_by_name(
-        dataproc_conf['edge_instance_name'])
+    if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in 
os.environ:
+        dataproc_conf['edge_instance_hostname'] = 
'{}.{}'.format(notebook_config['project_name'], os.environ['conf_domain_name'])
+    else:
+        dataproc_conf['edge_instance_hostname'] = 
GCPMeta().get_instance_public_ip_by_name(
+            dataproc_conf['edge_instance_name'])
     dataproc_conf['dlab_ssh_user'] = os.environ['conf_os_user']
     dataproc_conf['master_name'] = dataproc_conf['cluster_name'] + '-m'
     dataproc_conf['master_ip'] = 
meta_lib.GCPMeta().get_private_ip_address(dataproc_conf['master_name'])
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py 
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
index bbbd6de..5c53612 100644
--- 
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
@@ -211,7 +211,10 @@ if __name__ == "__main__":
         master_node_hostname = 
GCPMeta().get_private_ip_address(data_engine['master_node_name'])
         edge_instance_name = 
'{0}-{1}-{2}-edge'.format(data_engine['service_base_name'],
                                                        
data_engine['project_name'], data_engine['endpoint_tag'])
-        edge_instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
+        if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in 
os.environ:
+            edge_instance_hostname = 
'{}.{}'.format(notebook_config['project_name'], os.environ['conf_domain_name'])
+        else:
+            edge_instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
         edge_instance_private_ip = 
GCPMeta().get_private_ip_address(edge_instance_name)
         data_engine['dlab_ssh_user'] = os.environ['conf_os_user']
         keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], 
os.environ['conf_key_name'])
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py 
b/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
index 4f18e12..da23f70 100644
--- 
a/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
@@ -78,7 +78,10 @@ if __name__ == "__main__":
     instance_hostname = 
GCPMeta().get_private_ip_address(notebook_config['instance_name'])
     edge_instance_name = 
'{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'],
                                                    
notebook_config['project_name'], notebook_config['endpoint_tag'])
-    edge_instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
+    if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in 
os.environ:
+        edge_instance_hostname = 
'{}.{}'.format(notebook_config['project_name'], os.environ['conf_domain_name'])
+    else:
+        edge_instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
     edge_instance_private_ip = 
GCPMeta().get_private_ip_address(edge_instance_name)
     notebook_config['ssh_key_path'] = 
'{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
     notebook_config['dlab_ssh_user'] = os.environ['conf_os_user']
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py 
b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
index 79794b7..f299465 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
@@ -75,7 +75,10 @@ if __name__ == "__main__":
     instance_hostname = 
GCPMeta().get_private_ip_address(notebook_config['instance_name'])
     edge_instance_name = 
'{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'],
                                                    
notebook_config['project_name'], notebook_config['endpoint_tag'])
-    edge_instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
+    if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in 
os.environ:
+        edge_instance_hostname = 
'{}.{}'.format(notebook_config['project_name'], os.environ['conf_domain_name'])
+    else:
+        edge_instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
     edge_instance_private_ip = 
GCPMeta().get_private_ip_address(edge_instance_name)
     notebook_config['ssh_key_path'] = 
'{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
     notebook_config['dlab_ssh_user'] = os.environ['conf_os_user']
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/jupyterlab_configure.py 
b/infrastructure-provisioning/src/general/scripts/gcp/jupyterlab_configure.py
index b41b024..2c631f8 100644
--- 
a/infrastructure-provisioning/src/general/scripts/gcp/jupyterlab_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/gcp/jupyterlab_configure.py
@@ -98,7 +98,10 @@ if __name__ == "__main__":
     instance_hostname = 
GCPMeta().get_private_ip_address(notebook_config['instance_name'])
     edge_instance_name = 
'{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'],
                                                    
notebook_config['project_name'], notebook_config['endpoint_tag'])
-    edge_instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
+    if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in 
os.environ:
+        edge_instance_hostname = 
'{}.{}'.format(notebook_config['project_name'], os.environ['conf_domain_name'])
+    else:
+        edge_instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
     edge_instance_private_ip = 
GCPMeta().get_private_ip_address(edge_instance_name)
     notebook_config['ssh_key_path'] = 
'{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
     notebook_config['dlab_ssh_user'] = os.environ['conf_os_user']
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py 
b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
index d5e5b08..74a0521 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
@@ -79,7 +79,10 @@ if __name__ == "__main__":
     instance_hostname = 
GCPMeta().get_private_ip_address(notebook_config['instance_name'])
     edge_instance_name = 
'{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'],
                                                    
notebook_config['project_name'], notebook_config['endpoint_tag'])
-    edge_instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
+    if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in 
os.environ:
+        edge_instance_hostname = 
'{}.{}'.format(notebook_config['project_name'], os.environ['conf_domain_name'])
+    else:
+        edge_instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
     edge_instance_private_ip = 
GCPMeta().get_private_ip_address(edge_instance_name)
     notebook_config['ssh_key_path'] = 
'{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
     notebook_config['dlab_ssh_user'] = os.environ['conf_os_user']
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py 
b/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py
index 6cfd891..50ef930 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py
@@ -78,7 +78,10 @@ if __name__ == "__main__":
     instance_hostname = 
GCPMeta().get_private_ip_address(notebook_config['instance_name'])
     edge_instance_name = 
'{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'],
                                                    
notebook_config['project_name'], notebook_config['endpoint_tag'])
-    edge_instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
+    if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in 
os.environ:
+        edge_instance_hostname = 
'{}.{}'.format(notebook_config['project_name'], os.environ['conf_domain_name'])
+    else:
+        edge_instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
     edge_instance_private_ip = 
GCPMeta().get_private_ip_address(edge_instance_name)
     notebook_config['ssh_key_path'] = 
'{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
     notebook_config['dlab_ssh_user'] = os.environ['conf_os_user']
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py
 
b/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py
index f791e74..0bbac2b 100644
--- 
a/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py
@@ -85,7 +85,10 @@ if __name__ == "__main__":
     instance_hostname = 
GCPMeta().get_private_ip_address(notebook_config['instance_name'])
     edge_instance_name = 
'{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'],
                                                    
notebook_config['project_name'], notebook_config['endpoint_tag'])
-    edge_instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
+    if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in 
os.environ:
+        edge_instance_hostname = 
'{}.{}'.format(notebook_config['project_name'], os.environ['conf_domain_name'])
+    else:
+        edge_instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
     edge_instance_private_ip = 
GCPMeta().get_private_ip_address(edge_instance_name)
     notebook_config['ssh_key_path'] = 
'{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
     notebook_config['dlab_ssh_user'] = os.environ['conf_os_user']
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py 
b/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
index 950a1c0..26e5304 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
@@ -80,7 +80,10 @@ if __name__ == "__main__":
     instance_hostname = 
GCPMeta().get_private_ip_address(notebook_config['instance_name'])
     edge_instance_name = 
'{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'],
                                                    
notebook_config['project_name'], notebook_config['endpoint_tag'])
-    edge_instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
+    if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in 
os.environ:
+        edge_instance_hostname = 
'{}.{}'.format(notebook_config['project_name'], os.environ['conf_domain_name'])
+    else:
+        edge_instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
     edge_instance_private_ip = 
GCPMeta().get_private_ip_address(edge_instance_name)
     notebook_config['ssh_key_path'] = 
'{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
     notebook_config['dlab_ssh_user'] = os.environ['conf_os_user']
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py 
b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
index 7981005..5645659 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
@@ -80,7 +80,10 @@ if __name__ == "__main__":
     instance_hostname = 
GCPMeta().get_private_ip_address(notebook_config['instance_name'])
     edge_instance_name = 
'{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'],
                                                    
notebook_config['project_name'], notebook_config['endpoint_tag'])
-    edge_instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
+    if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in 
os.environ:
+        edge_instance_hostname = 
'{}.{}'.format(notebook_config['project_name'], os.environ['conf_domain_name'])
+    else:
+        edge_instance_hostname = 
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
     edge_instance_private_ip = 
GCPMeta().get_private_ip_address(edge_instance_name)
     notebook_config['ssh_key_path'] = 
'{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
     notebook_config['dlab_ssh_user'] = os.environ['conf_os_user']


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to