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 5bd1622 [DLAB-1593]: changed access links for notebooks in case
domain name is specified for aws
5bd1622 is described below
commit 5bd1622217cab058cc228b1359272f5e94cba661
Author: leonidfrolov <[email protected]>
AuthorDate: Thu Mar 12 10:41:46 2020 +0200
[DLAB-1593]: changed access links for notebooks in case domain name is
specified for aws
---
.../src/general/scripts/aws/dataengine-service_configure.py | 5 ++++-
.../src/general/scripts/aws/dataengine_configure.py | 6 +++++-
.../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 ++++-
9 files changed, 37 insertions(+), 9 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
index 20206de..8d8bcdf 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
@@ -226,7 +226,10 @@ if __name__ == "__main__":
emr_conf['edge_instance_ip'] =
get_instance_ip_address(emr_conf['tag_name'],
emr_conf['edge_instance_name']).get('Private')
else:
- emr_conf['edge_instance_ip'] =
get_instance_ip_address(emr_conf['tag_name'],
+ if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in
os.environ:
+ emr_conf['edge_instance_ip'] =
'{}.{}'.format(emr_conf['project_name'], os.environ['conf_domain_name'])
+ else:
+ emr_conf['edge_instance_ip'] =
get_instance_ip_address(emr_conf['tag_name'],
emr_conf['edge_instance_name']).get('Public')
emr_conf['user_keyname'] = os.environ['project_name']
emr_conf['os_user'] = os.environ['conf_os_user']
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
index 015a120..d6b088a 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
@@ -222,7 +222,11 @@ if __name__ == "__main__":
if data_engine['network_type'] == 'private':
edge_instance_ip =
get_instance_ip_address(data_engine['tag_name'],
edge_instance_name).get('Private')
else:
- edge_instance_ip =
get_instance_ip_address(data_engine['tag_name'],
edge_instance_name).get('Public')
+ if os.environ['conf_domain_name_enabled'] and 'conf_domain_name'
in os.environ:
+ edge_instance_ip = '{}.{}'.format(data_engine['project_name'],
+
os.environ['conf_domain_name'])
+ else:
+ edge_instance_ip =
get_instance_ip_address(data_engine['tag_name'],
edge_instance_name).get('Public')
if os.environ['conf_os_family'] == 'debian':
initial_user = 'ubuntu'
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
index a414f15..c8a543d 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
@@ -93,7 +93,10 @@ if __name__ == "__main__":
if notebook_config['network_type'] == 'private':
edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Private')
else:
- edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Public')
+ if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in
os.environ:
+ edge_instance_ip = '{}.{}'.format(notebook_config['project_name'],
os.environ['conf_domain_name'])
+ else:
+ edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Public')
keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name'])
edge_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 b9f4c97..0a9d2aa 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
@@ -89,7 +89,10 @@ if __name__ == "__main__":
if notebook_config['network_type'] == 'private':
edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Private')
else:
- edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Public')
+ if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in
os.environ:
+ edge_instance_ip = '{}.{}'.format(notebook_config['project_name'],
os.environ['conf_domain_name'])
+ else:
+ edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Public')
keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name'])
edge_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 04e9bce..17f3e48 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
@@ -91,7 +91,10 @@ if __name__ == "__main__":
if notebook_config['network_type'] == 'private':
edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Private')
else:
- edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Public')
+ if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in
os.environ:
+ edge_instance_ip = '{}.{}'.format(notebook_config['project_name'],
os.environ['conf_domain_name'])
+ else:
+ edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Public')
keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name'])
edge_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 7959880..e1cd4bf 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
@@ -93,7 +93,10 @@ if __name__ == "__main__":
if notebook_config['network_type'] == 'private':
edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Private')
else:
- edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Public')
+ if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in
os.environ:
+ edge_instance_ip = '{}.{}'.format(notebook_config['project_name'],
os.environ['conf_domain_name'])
+ else:
+ edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Public')
keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name'])
edge_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 56d9272..bb4a271 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
@@ -98,7 +98,10 @@ if __name__ == "__main__":
if notebook_config['network_type'] == 'private':
edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Private')
else:
- edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Public')
+ if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in
os.environ:
+ edge_instance_ip = '{}.{}'.format(notebook_config['project_name'],
os.environ['conf_domain_name'])
+ else:
+ edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Public')
keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name'])
edge_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 0bcf6ca..ca83380 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
@@ -96,7 +96,10 @@ if __name__ == "__main__":
if notebook_config['network_type'] == 'private':
edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Private')
else:
- edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Public')
+ if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in
os.environ:
+ edge_instance_ip = '{}.{}'.format(notebook_config['project_name'],
os.environ['conf_domain_name'])
+ else:
+ edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Public')
keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name'])
edge_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 2eb20f9..0773741 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
@@ -101,7 +101,10 @@ if __name__ == "__main__":
if notebook_config['network_type'] == 'private':
edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Private')
else:
- edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Public')
+ if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in
os.environ:
+ edge_instance_ip = '{}.{}'.format(notebook_config['project_name'],
os.environ['conf_domain_name'])
+ else:
+ edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Public')
keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name'])
edge_ip = get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Private')
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]