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 fb10676e8bc3d6e02bbf735db699ad2f9ee17748 Author: leonidfrolov <[email protected]> AuthorDate: Thu Mar 12 10:27:37 2020 +0200 [DLAB-1593]: changed access links for notebooks in case domain name is specified for aws --- .../aws/common_notebook_configure_dataengine-service.py | 5 ++++- .../src/general/scripts/aws/dataengine_configure.py | 12 +++++++----- .../src/general/scripts/aws/deeplearning_configure.py | 5 ++++- .../src/general/scripts/aws/jupyter_configure.py | 5 ++++- .../src/general/scripts/aws/jupyterlab_configure.py | 5 ++++- .../src/general/scripts/aws/rstudio_configure.py | 5 ++++- .../src/general/scripts/aws/tensor-rstudio_configure.py | 5 ++++- .../src/general/scripts/aws/tensor_configure.py | 5 ++++- .../src/general/scripts/aws/zeppelin_configure.py | 5 ++++- .../src/general/scripts/gcp/zeppelin_configure.py | 3 ++- 10 files changed, 41 insertions(+), 14 deletions(-) diff --git a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py index 0d51f8d..552efaf 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py +++ b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py @@ -70,7 +70,10 @@ if __name__ == "__main__": notebook_config['cluster_id'] = dlab.meta_lib.get_emr_id_by_name(notebook_config['cluster_name']) edge_instance_name = '{}-{}-{}-edge'.format(notebook_config['service_base_name'], os.environ['project_name'], os.environ['endpoint_name']) - edge_instance_hostname = dlab.meta_lib.get_instance_hostname(notebook_config['tag_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 = dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], edge_instance_name) if os.environ['application'] == 'deeplearning': application = 'jupyter' else: diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py index e0a4f0c..c74635a 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py @@ -74,7 +74,7 @@ def configure_slave(slave_number, data_engine): try: logging.info('[CONFIGURE PROXY ON SLAVE NODE]') print('[CONFIGURE PROXY ON ON SLAVE NODE]') - additional_config = {"proxy_host": edge_instance_hostname, "proxy_port": "3128"} + additional_config = {"proxy_host": data_engine['edge_instance_hostname'], "proxy_port": "3128"} params = "--hostname {} --instance_name {} --keyfile {} --additional_config '{}' --os_user {}"\ .format(slave_hostname, slave_name, keyfile_name, json.dumps(additional_config), data_engine['dlab_ssh_user']) @@ -200,10 +200,12 @@ if __name__ == "__main__": keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], os.environ['conf_key_name']) edge_instance_name = '{0}-{1}-{2}-edge'.format(data_engine['service_base_name'], data_engine['project_name'], data_engine['endpoint_name']) - edge_instance_hostname = dlab.meta_lib.get_instance_hostname(data_engine['tag_name'], edge_instance_name) edge_instance_private_ip = dlab.meta_lib.get_instance_ip_address(data_engine['tag_name'], edge_instance_name).get('Private') - data_engine['edge_instance_hostname'] = dlab.meta_lib.get_instance_hostname(data_engine['tag_name'], + if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in os.environ: + data_engine['edge_instance_hostname'] = '{}.{}'.format(data_engine['project_name'], os.environ['conf_domain_name']) + else: + data_engine['edge_instance_hostname'] = dlab.meta_lib.get_instance_hostname(data_engine['tag_name'], edge_instance_name) if os.environ['conf_os_family'] == 'debian': data_engine['initial_user'] = 'ubuntu' @@ -258,7 +260,7 @@ if __name__ == "__main__": try: logging.info('[CONFIGURE PROXY ON MASTER NODE]') print('[CONFIGURE PROXY ON ON MASTER NODE]') - additional_config = {"proxy_host": edge_instance_hostname, "proxy_port": "3128"} + additional_config = {"proxy_host": data_engine['edge_instance_hostname'], "proxy_port": "3128"} params = "--hostname {} --instance_name {} --keyfile {} --additional_config '{}' --os_user {}"\ .format(master_node_hostname, data_engine['master_node_name'], keyfile_name, json.dumps(additional_config), data_engine['dlab_ssh_user']) @@ -359,7 +361,7 @@ if __name__ == "__main__": "--type {} " \ "--exploratory_name {} " \ "--additional_info '{}'"\ - .format(edge_instance_hostname, + .format(data_engine['edge_instance_hostname'], keyfile_name, data_engine['dlab_ssh_user'], 'spark', diff --git a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py index a2ca856..7090a5b 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py @@ -90,7 +90,10 @@ if __name__ == "__main__": notebook_config['instance_name']) edge_instance_name = '{}-{}-{}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name'], notebook_config['endpoint_name']) - edge_instance_hostname = dlab.meta_lib.get_instance_hostname(notebook_config['tag_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 = dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], edge_instance_name) edge_instance_private_ip = dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private') notebook_config['edge_instance_hostname'] = dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], diff --git a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py index cc53b22..f41a420 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py @@ -90,7 +90,10 @@ if __name__ == "__main__": notebook_config['instance_name']) edge_instance_name = '{}-{}-{}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name'], notebook_config['endpoint_name']) - edge_instance_hostname = dlab.meta_lib.get_instance_hostname(notebook_config['tag_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 = dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], edge_instance_name) edge_instance_private_ip = dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private') notebook_config['edge_instance_hostname'] = dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], diff --git a/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py b/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py index d828df5..43316f5 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py @@ -90,7 +90,10 @@ if __name__ == "__main__": notebook_config['instance_name']) edge_instance_name = '{}-{}-{}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name'], notebook_config['endpoint_name']) - edge_instance_hostname = dlab.meta_lib.get_instance_hostname(notebook_config['tag_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 = dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], edge_instance_name) edge_instance_private_ip = dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private') notebook_config['edge_instance_hostname'] = dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], diff --git a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py index dd2a93c..bac418f 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py @@ -91,7 +91,10 @@ if __name__ == "__main__": notebook_config['instance_name']) edge_instance_name = '{}-{}-{}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name'], notebook_config['endpoint_name']) - edge_instance_hostname = dlab.meta_lib.get_instance_hostname(notebook_config['tag_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 = dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], edge_instance_name) edge_instance_private_ip = dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private') notebook_config['edge_instance_hostname'] = dlab.meta_lib.get_instance_hostname(notebook_config['tag_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 6baaf45..4d7b928 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py @@ -92,7 +92,10 @@ if __name__ == "__main__": notebook_config['instance_name']) edge_instance_name = '{}-{}-{}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name'], notebook_config['endpoint_name']) - edge_instance_hostname = dlab.meta_lib.get_instance_hostname(notebook_config['tag_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 = dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], edge_instance_name) edge_instance_private_ip = dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private') notebook_config['edge_instance_hostname'] = dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], diff --git a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py index 3cf3a46..f5c2deb 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py @@ -92,7 +92,10 @@ if __name__ == "__main__": notebook_config['instance_name']) edge_instance_name = '{}-{}-{}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name'], notebook_config['endpoint_name']) - edge_instance_hostname = dlab.meta_lib.get_instance_hostname(notebook_config['tag_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 = dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], edge_instance_name) edge_instance_private_ip = dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private') notebook_config['edge_instance_hostname'] = dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], diff --git a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py index dbdae70..fd6eab9 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py @@ -98,7 +98,10 @@ if __name__ == "__main__": notebook_config['instance_name']) edge_instance_name = '{}-{}-{}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name'], notebook_config['endpoint_name']) - edge_instance_hostname = dlab.meta_lib.get_instance_hostname(notebook_config['tag_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 = dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], edge_instance_name) edge_instance_private_ip = dlab.meta_lib.get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private') notebook_config['edge_instance_hostname'] = dlab.meta_lib.get_instance_hostname(notebook_config['tag_name'], diff --git a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py index 6454536..caff10d 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py @@ -89,7 +89,8 @@ if __name__ == "__main__": 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) + 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'] notebook_config['zone'] = os.environ['gcp_zone'] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
