You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/03/12 08:27:54 UTC
[incubator-dlab] branch DLAB-1593 updated: [DLAB-1593]: changed
access links for notebooks in case domain name is specified for aws
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 d9bd874 [DLAB-1593]: changed access links for notebooks in case domain name is specified for aws
d9bd874 is described below
commit d9bd8749a9d395560c2d210f906cc5872b0e0eef
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Mar 12 10:27:37 2020 +0200
[DLAB-1593]: changed access links for notebooks in case domain name is specified for aws
---
.../scripts/aws/common_notebook_configure_dataengine-service.py | 5 ++++-
.../src/general/scripts/aws/dataengine_configure.py | 5 ++++-
.../src/general/scripts/aws/deeplearning_configure.py | 7 ++++++-
.../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 ++++-
9 files changed, 38 insertions(+), 9 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 6fe139b..c8e0ee0 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
@@ -60,7 +60,10 @@ if __name__ == "__main__":
notebook_config['cluster_id'] = 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 = 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 = 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 224b0dc..015a120 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
@@ -214,7 +214,10 @@ if __name__ == "__main__":
data_engine['endpoint_name'] = os.environ['endpoint_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 = get_instance_hostname(data_engine['tag_name'], edge_instance_name)
+ if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in os.environ:
+ edge_instance_hostname = '{}.{}'.format(data_engine['project_name'], os.environ['conf_domain_name'])
+ else:
+ edge_instance_hostname = get_instance_hostname(data_engine['tag_name'], edge_instance_name)
edge_instance_private_ip = get_instance_ip_address(data_engine['tag_name'], edge_instance_name).get('Private')
if data_engine['network_type'] == 'private':
edge_instance_ip = get_instance_ip_address(data_engine['tag_name'], edge_instance_name).get('Private')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
index 7d504d8..a414f15 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
@@ -50,6 +50,7 @@ if __name__ == "__main__":
notebook_config['exploratory_name'] = ''
notebook_config['service_base_name'] = os.environ['conf_service_base_name'] = replace_multi_symbols(
os.environ['conf_service_base_name'].lower()[:12], '-', True)
+ notebook_config['project_name'] = os.environ['project_name']
notebook_config['instance_type'] = os.environ['aws_notebook_instance_type']
notebook_config['key_name'] = os.environ['conf_key_name']
notebook_config['user_keyname'] = os.environ['project_name']
@@ -83,7 +84,11 @@ if __name__ == "__main__":
instance_hostname = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name'])
edge_instance_name = '{}-{}-{}-edge'.format(notebook_config['service_base_name'],
os.environ['project_name'], os.environ['endpoint_name'])
- edge_instance_hostname = 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 = get_instance_hostname(notebook_config['tag_name'], edge_instance_name)
+
edge_instance_private_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private')
if notebook_config['network_type'] == 'private':
edge_instance_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
index 3ff45c8..b9f4c97 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
@@ -81,7 +81,10 @@ if __name__ == "__main__":
instance_hostname = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name'])
edge_instance_name = '{}-{}-{}-edge'.format(notebook_config['service_base_name'],
os.environ['project_name'], os.environ['endpoint_name'])
- edge_instance_hostname = 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 = get_instance_hostname(notebook_config['tag_name'], edge_instance_name)
edge_instance_private_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private')
if notebook_config['network_type'] == 'private':
edge_instance_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py b/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
index b864fd4..04e9bce 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
@@ -83,7 +83,10 @@ if __name__ == "__main__":
instance_hostname = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name'])
edge_instance_name = '{}-{}-{}-edge'.format(notebook_config['service_base_name'],
os.environ['project_name'], os.environ['endpoint_name'])
- edge_instance_hostname = 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 = get_instance_hostname(notebook_config['tag_name'], edge_instance_name)
edge_instance_private_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private')
if notebook_config['network_type'] == 'private':
edge_instance_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
index 574ad47..7959880 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
@@ -85,7 +85,10 @@ if __name__ == "__main__":
instance_hostname = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name'])
edge_instance_name = '{}-{}-{}-edge'.format(notebook_config['service_base_name'],
os.environ['project_name'], os.environ['endpoint_name'])
- edge_instance_hostname = 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 = get_instance_hostname(notebook_config['tag_name'], edge_instance_name)
edge_instance_private_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private')
if notebook_config['network_type'] == 'private':
edge_instance_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private')
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 a10ccae..56d9272 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
@@ -90,7 +90,10 @@ if __name__ == "__main__":
instance_hostname = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name'])
edge_instance_name = '{}-{}-{}-edge'.format(notebook_config['service_base_name'],
os.environ['project_name'], os.environ['endpoint_name'])
- edge_instance_hostname = 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 = get_instance_hostname(notebook_config['tag_name'], edge_instance_name)
edge_instance_private_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private')
if notebook_config['network_type'] == 'private':
edge_instance_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
index ebcb814..0bcf6ca 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
@@ -88,7 +88,10 @@ if __name__ == "__main__":
instance_hostname = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name'])
edge_instance_name = '{}-{}-{}-edge'.format(notebook_config['service_base_name'],
os.environ['project_name'], os.environ['endpoint_name'])
- edge_instance_hostname = 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 = get_instance_hostname(notebook_config['tag_name'], edge_instance_name)
edge_instance_private_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private')
if notebook_config['network_type'] == 'private':
edge_instance_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
index 8e8e94b..2eb20f9 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
@@ -93,7 +93,10 @@ if __name__ == "__main__":
instance_hostname = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name'])
edge_instance_name = '{}-{}-{}-edge'.format(notebook_config['service_base_name'],
os.environ['project_name'], os.environ['endpoint_name'])
- edge_instance_hostname = 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 = get_instance_hostname(notebook_config['tag_name'], edge_instance_name)
edge_instance_private_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private')
if notebook_config['network_type'] == 'private':
edge_instance_ip = get_instance_ip_address(notebook_config['tag_name'], edge_instance_name).get('Private')
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org