This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-252
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-252 by this push:
new 2d2d1b7 Fixed issue with type of Edge IP address
2d2d1b7 is described below
commit 2d2d1b7eb9fdb7970b577cd6316564fe207f9d6b
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Thu Mar 21 16:27:03 2019 +0200
Fixed issue with type of Edge IP address
---
.../general/scripts/azure/dataengine_configure.py | 14 ++++++++++----
.../scripts/azure/deeplearning_configure.py | 18 ++++++++++++------
.../src/general/scripts/azure/jupyter_configure.py | 18 ++++++++++++------
.../src/general/scripts/azure/rstudio_configure.py | 18 ++++++++++++------
.../src/general/scripts/azure/tensor_configure.py | 18 ++++++++++++------
.../general/scripts/azure/zeppelin_configure.py | 22 ++++++++++++++--------
6 files changed, 72 insertions(+), 36 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
index 064bed1..7e7df42 100644
---
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
@@ -103,7 +103,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": edge_instance_private_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'])
@@ -214,8 +214,14 @@ if __name__ == "__main__":
master_node_hostname =
AzureMeta().get_private_ip_address(data_engine['resource_group_name'],
data_engine['master_node_name'])
edge_instance_name =
'{}-{}-edge'.format(data_engine['service_base_name'], data_engine['user_name'])
- edge_instance_hostname =
AzureMeta().get_private_ip_address(data_engine['resource_group_name'],
+ edge_instance_private_hostname =
AzureMeta().get_private_ip_address(data_engine['resource_group_name'],
edge_instance_name)
+ if os.environ['conf_network_type'] == 'private':
+ edge_instance_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
+
edge_instance_name)
+ else:
+ edge_instance_hostname =
AzureMeta().get_instance_public_ip_address(notebook_config['resource_group_name'],
+
edge_instance_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")
@@ -300,7 +306,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": edge_instance_private_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'])
@@ -399,7 +405,7 @@ if __name__ == "__main__":
"--type {} " \
"--exploratory_name {} " \
"--additional_info '{}'"\
- .format(edge_instance_hostname,
+ .format(edge_instance_private_hostname,
keyfile_name,
data_engine['dlab_ssh_user'],
'spark',
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
index ab14a5b..a5ab314 100644
---
a/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
@@ -70,8 +70,14 @@ if __name__ == "__main__":
instance_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
notebook_config['instance_name'])
edge_instance_name =
'{}-{}-edge'.format(notebook_config['service_base_name'],
notebook_config['user_name'])
- edge_instance_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
-
edge_instance_name)
+ edge_instance_private_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
+
edge_instance_name)
+ if os.environ['conf_network_type'] == 'private':
+ edge_instance_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
+
edge_instance_name)
+ else:
+ edge_instance_hostname =
AzureMeta().get_instance_public_ip_address(notebook_config['resource_group_name'],
+
edge_instance_name)
keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name'])
if os.environ['conf_os_family'] == 'debian':
@@ -108,7 +114,7 @@ if __name__ == "__main__":
try:
logging.info('[CONFIGURE PROXY ON DEEP LEARNING INSTANCE]')
print('[CONFIGURE PROXY ON DEEP LEARNING INSTANCE]')
- additional_config = {"proxy_host": edge_instance_hostname,
"proxy_port": "3128"}
+ additional_config = {"proxy_host": edge_instance_private_hostname,
"proxy_port": "3128"}
params = "--hostname {} --instance_name {} --keyfile {}
--additional_config '{}' --os_user {}"\
.format(instance_hostname, notebook_config['instance_name'],
keyfile_name, json.dumps(additional_config), notebook_config['dlab_ssh_user'])
try:
@@ -241,8 +247,8 @@ if __name__ == "__main__":
notebook_config['instance_name'])
remount_azure_disk(True, notebook_config['dlab_ssh_user'],
instance_hostname, keyfile_name)
set_git_proxy(notebook_config['dlab_ssh_user'],
instance_hostname, keyfile_name,
- 'http://{}:3128'.format(edge_instance_hostname))
- additional_config = {"proxy_host": edge_instance_hostname,
"proxy_port": "3128"}
+
'http://{}:3128'.format(edge_instance_private_hostname))
+ additional_config = {"proxy_host":
edge_instance_private_hostname, "proxy_port": "3128"}
params = "--hostname {} --instance_name {} --keyfile {}
--additional_config '{}' --os_user {}" \
.format(instance_hostname,
notebook_config['instance_name'], keyfile_name,
json.dumps(additional_config),
notebook_config['dlab_ssh_user'])
@@ -266,7 +272,7 @@ if __name__ == "__main__":
"--type {} " \
"--exploratory_name {} " \
"--additional_info '{}'"\
- .format(edge_instance_hostname,
+ .format(edge_instance_private_hostname,
keyfile_name,
notebook_config['dlab_ssh_user'],
'jupyter',
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
index 065f741..dc57bec 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
@@ -69,8 +69,14 @@ if __name__ == "__main__":
instance_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
notebook_config['instance_name'])
edge_instance_name =
'{}-{}-edge'.format(notebook_config['service_base_name'],
notebook_config['user_name'])
- edge_instance_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
-
edge_instance_name)
+ edge_instance_private_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
+
edge_instance_name)
+ if os.environ['conf_network_type'] == 'private':
+ edge_instance_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
+
edge_instance_name)
+ else:
+ edge_instance_hostname =
AzureMeta().get_instance_public_ip_address(notebook_config['resource_group_name'],
+
edge_instance_name)
keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name'])
if os.environ['conf_os_family'] == 'debian':
@@ -107,7 +113,7 @@ if __name__ == "__main__":
try:
logging.info('[CONFIGURE PROXY ON JUPYTER INSTANCE]')
print('[CONFIGURE PROXY ON JUPYTER INSTANCE]')
- additional_config = {"proxy_host": edge_instance_hostname,
"proxy_port": "3128"}
+ additional_config = {"proxy_host": edge_instance_private_hostname,
"proxy_port": "3128"}
params = "--hostname {} --instance_name {} --keyfile {}
--additional_config '{}' --os_user {}"\
.format(instance_hostname, notebook_config['instance_name'],
keyfile_name, json.dumps(additional_config),
notebook_config['dlab_ssh_user'])
@@ -242,8 +248,8 @@ if __name__ == "__main__":
notebook_config['instance_name'])
remount_azure_disk(True, notebook_config['dlab_ssh_user'],
instance_hostname, keyfile_name)
set_git_proxy(notebook_config['dlab_ssh_user'],
instance_hostname, keyfile_name,
- 'http://{}:3128'.format(edge_instance_hostname))
- additional_config = {"proxy_host": edge_instance_hostname,
"proxy_port": "3128"}
+
'http://{}:3128'.format(edge_instance_private_hostname))
+ additional_config = {"proxy_host":
edge_instance_private_hostname, "proxy_port": "3128"}
params = "--hostname {} --instance_name {} --keyfile {}
--additional_config '{}' --os_user {}" \
.format(instance_hostname,
notebook_config['instance_name'], keyfile_name,
json.dumps(additional_config),
notebook_config['dlab_ssh_user'])
@@ -267,7 +273,7 @@ if __name__ == "__main__":
"--type {} " \
"--exploratory_name {} " \
"--additional_info '{}'"\
- .format(edge_instance_hostname,
+ .format(edge_instance_private_hostname,
keyfile_name,
notebook_config['dlab_ssh_user'],
'jupyter',
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
index 61e1680..c85b0b7 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
@@ -70,8 +70,14 @@ if __name__ == "__main__":
instance_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
notebook_config['instance_name'])
edge_instance_name =
'{}-{}-edge'.format(notebook_config['service_base_name'],
notebook_config['user_name'])
- edge_instance_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
-
edge_instance_name)
+ edge_instance_private_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
+
edge_instance_name)
+ if os.environ['conf_network_type'] == 'private':
+ edge_instance_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
+
edge_instance_name)
+ else:
+ edge_instance_hostname =
AzureMeta().get_instance_public_ip_address(notebook_config['resource_group_name'],
+
edge_instance_name)
keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name'])
notebook_config['rstudio_pass'] = id_generator()
@@ -109,7 +115,7 @@ if __name__ == "__main__":
try:
logging.info('[CONFIGURE PROXY ON R_STUDIO INSTANCE]')
print('[CONFIGURE PROXY ON R_STUDIO INSTANCE]')
- additional_config = {"proxy_host": edge_instance_hostname,
"proxy_port": "3128"}
+ additional_config = {"proxy_host": edge_instance_private_hostname,
"proxy_port": "3128"}
params = "--hostname {} --instance_name {} --keyfile {}
--additional_config '{}' --os_user {}" \
.format(instance_hostname, notebook_config['instance_name'],
keyfile_name, json.dumps(additional_config),
notebook_config['dlab_ssh_user'])
@@ -241,8 +247,8 @@ if __name__ == "__main__":
notebook_config['instance_name'])
remount_azure_disk(True, notebook_config['dlab_ssh_user'],
instance_hostname, keyfile_name)
set_git_proxy(notebook_config['dlab_ssh_user'],
instance_hostname, keyfile_name,
- 'http://{}:3128'.format(edge_instance_hostname))
- additional_config = {"proxy_host": edge_instance_hostname,
"proxy_port": "3128"}
+
'http://{}:3128'.format(edge_instance_private_hostname))
+ additional_config = {"proxy_host":
edge_instance_private_hostname, "proxy_port": "3128"}
params = "--hostname {} --instance_name {} --keyfile {}
--additional_config '{}' --os_user {}" \
.format(instance_hostname,
notebook_config['instance_name'], keyfile_name,
json.dumps(additional_config),
notebook_config['dlab_ssh_user'])
@@ -271,7 +277,7 @@ if __name__ == "__main__":
"--type {} " \
"--exploratory_name {} " \
"--additional_info '{}'"\
- .format(edge_instance_hostname,
+ .format(edge_instance_private_hostname,
keyfile_name,
notebook_config['dlab_ssh_user'],
'rstudio',
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
index b502766..28c2048 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
@@ -72,8 +72,14 @@ if __name__ == "__main__":
instance_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
notebook_config['instance_name'])
edge_instance_name =
'{}-{}-edge'.format(notebook_config['service_base_name'],
notebook_config['user_name'])
- edge_instance_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
-
edge_instance_name)
+ edge_instance_private_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
+
edge_instance_name)
+ if os.environ['conf_network_type'] == 'private':
+ edge_instance_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
+
edge_instance_name)
+ else:
+ edge_instance_hostname =
AzureMeta().get_instance_public_ip_address(notebook_config['resource_group_name'],
+
edge_instance_name)
keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name'])
if os.environ['conf_os_family'] == 'debian':
@@ -109,7 +115,7 @@ if __name__ == "__main__":
try:
logging.info('[CONFIGURE PROXY ON TENSOR INSTANCE]')
print('[CONFIGURE PROXY ON TENSOR INSTANCE]')
- additional_config = {"proxy_host": edge_instance_hostname,
"proxy_port": "3128"}
+ additional_config = {"proxy_host": edge_instance_private_hostname,
"proxy_port": "3128"}
params = "--hostname {} --instance_name {} --keyfile {}
--additional_config '{}' --os_user {}"\
.format(instance_hostname, notebook_config['instance_name'],
keyfile_name, json.dumps(additional_config), notebook_config['dlab_ssh_user'])
try:
@@ -238,8 +244,8 @@ if __name__ == "__main__":
notebook_config['instance_name'])
remount_azure_disk(True, notebook_config['dlab_ssh_user'],
instance_hostname, keyfile_name)
set_git_proxy(notebook_config['dlab_ssh_user'],
instance_hostname, keyfile_name,
- 'http://{}:3128'.format(edge_instance_hostname))
- additional_config = {"proxy_host": edge_instance_hostname,
"proxy_port": "3128"}
+
'http://{}:3128'.format(edge_instance_private_hostname))
+ additional_config = {"proxy_host":
edge_instance_private_hostname, "proxy_port": "3128"}
params = "--hostname {} --instance_name {} --keyfile {}
--additional_config '{}' --os_user {}" \
.format(instance_hostname,
notebook_config['instance_name'], keyfile_name,
json.dumps(additional_config),
notebook_config['dlab_ssh_user'])
@@ -263,7 +269,7 @@ if __name__ == "__main__":
"--type {} " \
"--exploratory_name {} " \
"--additional_info '{}'"\
- .format(edge_instance_hostname,
+ .format(edge_instance_private_hostname,
keyfile_name,
notebook_config['dlab_ssh_user'],
'jupyter',
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
index 5ca4b77..505e930 100644
---
a/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
@@ -71,8 +71,14 @@ if __name__ == "__main__":
instance_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
notebook_config['instance_name'])
edge_instance_name =
'{}-{}-edge'.format(notebook_config['service_base_name'],
notebook_config['user_name'])
- edge_instance_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
-
edge_instance_name)
+ edge_instance_private_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
+
edge_instance_name)
+ if os.environ['conf_network_type'] == 'private':
+ edge_instance_hostname =
AzureMeta().get_private_ip_address(notebook_config['resource_group_name'],
+
edge_instance_name)
+ else:
+ edge_instance_hostname =
AzureMeta().get_instance_public_ip_address(notebook_config['resource_group_name'],
+
edge_instance_name)
keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name'])
if os.environ['conf_os_family'] == 'debian':
@@ -109,7 +115,7 @@ if __name__ == "__main__":
try:
logging.info('[CONFIGURE PROXY ON ZEPPELIN INSTANCE]')
print('[CONFIGURE PROXY ON ZEPPELIN INSTANCE]')
- additional_config = {"proxy_host": edge_instance_hostname,
"proxy_port": "3128"}
+ additional_config = {"proxy_host": edge_instance_private_hostname,
"proxy_port": "3128"}
params = "--hostname {} --instance_name {} --keyfile {}
--additional_config '{}' --os_user {}" \
.format(instance_hostname, notebook_config['instance_name'],
keyfile_name, json.dumps(additional_config),
notebook_config['dlab_ssh_user'])
@@ -145,7 +151,7 @@ if __name__ == "__main__":
try:
logging.info('[CONFIGURE ZEPPELIN NOTEBOOK INSTANCE]')
print('[CONFIGURE ZEPPELIN NOTEBOOK INSTANCE]')
- additional_config = {"frontend_hostname": edge_instance_hostname,
+ additional_config = {"frontend_hostname":
edge_instance_private_hostname,
"backend_hostname": instance_hostname,
"backend_port": "8080",
"nginx_template_dir": "/root/templates/"}
@@ -160,7 +166,7 @@ if __name__ == "__main__":
"--exploratory_name {}" \
.format(instance_hostname, notebook_config['instance_name'],
keyfile_name, os.environ['azure_region'],
json.dumps(additional_config),
notebook_config['dlab_ssh_user'], os.environ['notebook_spark_version'],
- os.environ['notebook_hadoop_version'],
edge_instance_hostname, '3128',
+ os.environ['notebook_hadoop_version'],
edge_instance_private_hostname, '3128',
os.environ['notebook_zeppelin_version'],
os.environ['notebook_scala_version'],
os.environ['notebook_livy_version'],
os.environ['notebook_multiple_clusters'],
os.environ['notebook_r_mirror'], 'null',
@@ -253,8 +259,8 @@ if __name__ == "__main__":
notebook_config['instance_name'])
remount_azure_disk(True, notebook_config['dlab_ssh_user'],
instance_hostname, keyfile_name)
set_git_proxy(notebook_config['dlab_ssh_user'],
instance_hostname, keyfile_name,
- 'http://{}:3128'.format(edge_instance_hostname))
- additional_config = {"proxy_host": edge_instance_hostname,
"proxy_port": "3128"}
+
'http://{}:3128'.format(edge_instance_private_hostname))
+ additional_config = {"proxy_host":
edge_instance_private_hostname, "proxy_port": "3128"}
params = "--hostname {} --instance_name {} --keyfile {}
--additional_config '{}' --os_user {}" \
.format(instance_hostname,
notebook_config['instance_name'], keyfile_name,
json.dumps(additional_config),
notebook_config['dlab_ssh_user'])
@@ -278,7 +284,7 @@ if __name__ == "__main__":
"--type {} " \
"--exploratory_name {} " \
"--additional_info '{}'"\
- .format(edge_instance_hostname,
+ .format(edge_instance_private_hostname,
keyfile_name,
notebook_config['dlab_ssh_user'],
'zeppelin',
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
