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

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


The following commit(s) were added to refs/heads/DLAB-1546 by this push:
     new cce0632  [DLAB-1546]: added name convention changes
cce0632 is described below

commit cce063282cbc444f9f3ed064cdd53993b158bcc4
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Fri Mar 6 12:59:14 2020 +0200

    [DLAB-1546]: added name convention changes
---
 .../src/general/scripts/azure/dataengine_configure.py              | 5 +++--
 .../src/general/scripts/azure/deeplearning_configure.py            | 7 ++++---
 .../src/general/scripts/azure/jupyter_configure.py                 | 5 +++--
 .../src/general/scripts/azure/jupyterlab_configure.py              | 5 +++--
 .../src/general/scripts/azure/rstudio_configure.py                 | 5 +++--
 .../src/general/scripts/azure/tensor_configure.py                  | 5 +++--
 .../src/general/scripts/azure/zeppelin_configure.py                | 5 +++--
 7 files changed, 22 insertions(+), 15 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py 
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
index 58b9abf..8d90b5e 100644
--- 
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
@@ -208,12 +208,13 @@ if __name__ == "__main__":
                                                        
data_engine['endpoint_name'])
         edge_instance_private_hostname = 
AzureMeta.get_private_ip_address(data_engine['resource_group_name'],
                                                                           
edge_instance_name)
+        data_engine['edge_instance_dns_name'] = 
'host-{}.{}.cloudapp.azure.com'.format(edge_instance_name,
+                                                                               
        data_engine['region'])
         if os.environ['conf_network_type'] == 'private':
             edge_instance_hostname = 
AzureMeta.get_private_ip_address(data_engine['resource_group_name'],
                                                                       
edge_instance_name)
         else:
-            edge_instance_hostname = 
AzureMeta.get_instance_public_ip_address(data_engine['resource_group_name'],
-                                                                              
edge_instance_name)
+            edge_instance_hostname = data_engine['edge_instance_dns_name']
         keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], 
os.environ['conf_key_name'])
         key = RSA.importKey(open(keyfile_name, 'rb').read())
         data_engine['public_ssh_key'] = key.publickey().exportKey("OpenSSH")
diff --git 
a/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
 
b/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
index 0ac25dc..37473b7 100644
--- 
a/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
@@ -111,12 +111,13 @@ if __name__ == "__main__":
                                                        
notebook_config['endpoint_name'])
         edge_instance_private_hostname = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
                                                                           
edge_instance_name)
+        notebook_config['edge_instance_dns_name'] = 
'host-{}.{}.cloudapp.azure.com'.format(edge_instance_name,
+                                                                               
            os.environ['azure_region'])
         if os.environ['conf_network_type'] == 'private':
             edge_instance_hostname = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
                                                                       
edge_instance_name)
         else:
-            edge_instance_hostname = 
AzureMeta.get_instance_public_ip_address(notebook_config['resource_group_name'],
-                                                                              
edge_instance_name)
+            edge_instance_hostname = notebook_config['edge_instance_dns_name']
         keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], 
os.environ['conf_key_name'])
         edge_hostname = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
                                                          edge_instance_name)
@@ -325,7 +326,7 @@ if __name__ == "__main__":
 
     try:
         ip_address = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
-                                                        
notebook_config['instance_name'])
+                                                      
notebook_config['instance_name'])
         tensorboard_ip_url = 'http://' + ip_address + ':6006'
         jupyter_ip_url = 'http://' + ip_address + 
':8888/{}/'.format(notebook_config['exploratory_name'])
         ungit_ip_url = "http://"; + ip_address + 
":8085/{}-ungit/".format(notebook_config['exploratory_name'])
diff --git 
a/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py 
b/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
index 67832bf..f5f9168 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
@@ -110,12 +110,13 @@ if __name__ == "__main__":
                                                        
notebook_config['endpoint_name'])
         edge_instance_private_hostname = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
                                                                           
edge_instance_name)
+        notebook_config['edge_instance_dns_name'] = 
'host-{}.{}.cloudapp.azure.com'.format(edge_instance_name,
+                                                                               
            os.environ['azure_region'])
         if os.environ['conf_network_type'] == 'private':
             edge_instance_hostname = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
                                                                       
edge_instance_name)
         else:
-            edge_instance_hostname = 
AzureMeta.get_instance_public_ip_address(notebook_config['resource_group_name'],
-                                                                              
edge_instance_name)
+            edge_instance_hostname = notebook_config['edge_instance_dns_name']
         keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], 
os.environ['conf_key_name'])
         edge_hostname = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
                                                          edge_instance_name)
diff --git 
a/infrastructure-provisioning/src/general/scripts/azure/jupyterlab_configure.py 
b/infrastructure-provisioning/src/general/scripts/azure/jupyterlab_configure.py
index 6ed0e39..1984360 100644
--- 
a/infrastructure-provisioning/src/general/scripts/azure/jupyterlab_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/azure/jupyterlab_configure.py
@@ -110,12 +110,13 @@ if __name__ == "__main__":
                                                        
notebook_config['endpoint_name'])
         edge_instance_private_hostname = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
                                                                           
edge_instance_name)
+        notebook_config['edge_instance_dns_name'] = 
'host-{}.{}.cloudapp.azure.com'.format(edge_instance_name,
+                                                                               
            os.environ['azure_region'])
         if os.environ['conf_network_type'] == 'private':
             edge_instance_hostname = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
                                                                       
edge_instance_name)
         else:
-            edge_instance_hostname = 
AzureMeta.get_instance_public_ip_address(notebook_config['resource_group_name'],
-                                                                              
edge_instance_name)
+            edge_instance_hostname = notebook_config['edge_instance_dns_name']
         keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], 
os.environ['conf_key_name'])
         edge_hostname = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
                                                          edge_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 7a28ec7..c4f31fe 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
@@ -111,12 +111,13 @@ if __name__ == "__main__":
                                                        
notebook_config['endpoint_name'])
         edge_instance_private_hostname = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
                                                                           
edge_instance_name)
+        notebook_config['edge_instance_dns_name'] = 
'host-{}.{}.cloudapp.azure.com'.format(edge_instance_name,
+                                                                               
            os.environ['azure_region'])
         if os.environ['conf_network_type'] == 'private':
             edge_instance_hostname = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
                                                                       
edge_instance_name)
         else:
-            edge_instance_hostname = 
AzureMeta.get_instance_public_ip_address(notebook_config['resource_group_name'],
-                                                                              
edge_instance_name)
+            edge_instance_hostname = notebook_config['edge_instance_dns_name']
         keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], 
os.environ['conf_key_name'])
         edge_hostname = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
                                                          edge_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 36404f6..1c98eee 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
@@ -113,12 +113,13 @@ if __name__ == "__main__":
                                                      
notebook_config['endpoint_name'])
         edge_instance_private_hostname = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
                                                                           
edge_instance_name)
+        notebook_config['edge_instance_dns_name'] = 
'host-{}.{}.cloudapp.azure.com'.format(edge_instance_name,
+                                                                               
            os.environ['azure_region'])
         if os.environ['conf_network_type'] == 'private':
             edge_instance_hostname = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
                                                                       
edge_instance_name)
         else:
-            edge_instance_hostname = 
AzureMeta.get_instance_public_ip_address(notebook_config['resource_group_name'],
-                                                                              
edge_instance_name)
+            edge_instance_hostname = notebook_config['edge_instance_dns_name']
         keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], 
os.environ['conf_key_name'])
         edge_hostname = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
                                                          edge_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 1be1281..4b2d14a 100644
--- 
a/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
@@ -112,12 +112,13 @@ if __name__ == "__main__":
                                                      
notebook_config['endpoint_name'])
         edge_instance_private_hostname = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
                                                                           
edge_instance_name)
+        notebook_config['edge_instance_dns_name'] = 
'host-{}.{}.cloudapp.azure.com'.format(edge_instance_name,
+                                                                               
            os.environ['azure_region'])
         if os.environ['conf_network_type'] == 'private':
             edge_instance_hostname = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
                                                                       
edge_instance_name)
         else:
-            edge_instance_hostname = 
AzureMeta.get_instance_public_ip_address(notebook_config['resource_group_name'],
-                                                                               
 edge_instance_name)
+            edge_instance_hostname = notebook_config['edge_instance_dns_name']
         keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], 
os.environ['conf_key_name'])
         edge_hostname = 
AzureMeta.get_private_ip_address(notebook_config['resource_group_name'],
                                                          edge_instance_name)


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

Reply via email to