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 3759b3a2323ed2b2deb3e5d996a6e166f03f4db8 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 | 8 ++++++-- .../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 | 6 ++++-- .../src/general/scripts/gcp/tensor_configure.py | 6 ++++-- .../src/general/scripts/gcp/zeppelin_configure.py | 6 ++++-- 10 files changed, 42 insertions(+), 14 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 05b9c9b..5bfa4f0 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py @@ -170,8 +170,12 @@ 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'] = 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 d50e0f0..a089583 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py @@ -204,7 +204,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 f9762ac..8b3a612 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py @@ -85,7 +85,10 @@ if __name__ == "__main__": edge_instance_name = '{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name'], notebook_config['endpoint_name']) - 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 b8744e8..c6fd780 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py @@ -85,7 +85,10 @@ if __name__ == "__main__": edge_instance_name = '{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name'], notebook_config['endpoint_name']) - 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 fad785b..506c6d2 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/jupyterlab_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/jupyterlab_configure.py @@ -85,7 +85,10 @@ if __name__ == "__main__": edge_instance_name = '{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name'], notebook_config['endpoint_name']) - 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 a51df46..513ce92 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py @@ -86,7 +86,10 @@ if __name__ == "__main__": edge_instance_name = '{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name'], notebook_config['endpoint_name']) - 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 021eb4c..335890c 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py @@ -87,7 +87,10 @@ if __name__ == "__main__": edge_instance_name = '{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name'], notebook_config['endpoint_name']) - 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 282e0d0..46cc6c8 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py @@ -90,8 +90,10 @@ if __name__ == "__main__": edge_instance_name = '{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name'], notebook_config['endpoint_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) + 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'] notebook_config['zone'] = os.environ['gcp_zone'] diff --git a/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py index a50afd1..44faec7 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py @@ -86,8 +86,10 @@ if __name__ == "__main__": edge_instance_name = '{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name'], notebook_config['endpoint_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) + 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'] notebook_config['zone'] = os.environ['gcp_zone'] diff --git a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py index 4c7839b..affb87b 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py @@ -86,8 +86,10 @@ if __name__ == "__main__": edge_instance_name = '{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name'], notebook_config['endpoint_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) + 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'] notebook_config['zone'] = os.environ['gcp_zone'] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
