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
commit 405dc2ba3e42dc7b3c2a71b1322b580e69a27137 Author: leonidfrolov <[email protected]> AuthorDate: Thu Mar 12 12:06:10 2020 +0200 [DLAB-1593]: changed access urls for notebook in case domain name is specified for azure --- .../src/general/scripts/azure/common_create_notebook_image.py | 5 ++++- .../src/general/scripts/azure/dataengine_configure.py | 5 ++++- .../src/general/scripts/azure/deeplearning_configure.py | 5 ++++- .../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 ++++- 8 files changed, 32 insertions(+), 8 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..c349ec0 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 @@ -66,7 +66,10 @@ if __name__ == "__main__": edge_instance_name = '{0}-{1}-{2}-edge'.format(image_conf['service_base_name'], image_conf['project_name'], image_conf['endpoint_name']) - edge_instance_hostname = AzureMeta.get_private_ip_address(image_conf['resource_group_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 = AzureMeta.get_private_ip_address(image_conf['resource_group_name'], edge_instance_name) keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], os.environ['conf_key_name']) diff --git a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py index 8d90b5e..34e7ece 100644 --- a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py +++ b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py @@ -214,7 +214,10 @@ if __name__ == "__main__": edge_instance_hostname = AzureMeta.get_private_ip_address(data_engine['resource_group_name'], edge_instance_name) else: - edge_instance_hostname = data_engine['edge_instance_dns_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 = 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 37473b7..38c0875 100644 --- a/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py +++ b/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py @@ -117,7 +117,10 @@ if __name__ == "__main__": edge_instance_hostname = AzureMeta.get_private_ip_address(notebook_config['resource_group_name'], edge_instance_name) else: - edge_instance_hostname = notebook_config['edge_instance_dns_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 = 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/jupyter_configure.py b/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py index f5f9168..0a87a9c 100644 --- a/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py +++ b/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py @@ -116,7 +116,10 @@ if __name__ == "__main__": edge_instance_hostname = AzureMeta.get_private_ip_address(notebook_config['resource_group_name'], edge_instance_name) else: - edge_instance_hostname = notebook_config['edge_instance_dns_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 = 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 1984360..d328be1 100644 --- a/infrastructure-provisioning/src/general/scripts/azure/jupyterlab_configure.py +++ b/infrastructure-provisioning/src/general/scripts/azure/jupyterlab_configure.py @@ -116,7 +116,10 @@ if __name__ == "__main__": edge_instance_hostname = AzureMeta.get_private_ip_address(notebook_config['resource_group_name'], edge_instance_name) else: - edge_instance_hostname = notebook_config['edge_instance_dns_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 = 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 c4f31fe..8d4f9b2 100644 --- a/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py +++ b/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py @@ -117,7 +117,10 @@ if __name__ == "__main__": edge_instance_hostname = AzureMeta.get_private_ip_address(notebook_config['resource_group_name'], edge_instance_name) else: - edge_instance_hostname = notebook_config['edge_instance_dns_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 = 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 1c98eee..a8017cf 100644 --- a/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py +++ b/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py @@ -119,7 +119,10 @@ if __name__ == "__main__": edge_instance_hostname = AzureMeta.get_private_ip_address(notebook_config['resource_group_name'], edge_instance_name) else: - edge_instance_hostname = notebook_config['edge_instance_dns_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 = 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 d870ecc..45b8450 100644 --- a/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py +++ b/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py @@ -118,7 +118,10 @@ if __name__ == "__main__": edge_instance_hostname = AzureMeta.get_private_ip_address(notebook_config['resource_group_name'], edge_instance_name) else: - edge_instance_hostname = notebook_config['edge_instance_dns_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 = 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]
