This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch DLAB-1120
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 0eaab014edbb9628381315945960927ffb40b778
Author: Dyoma33 <demian.mysakove...@gmail.com>
AuthorDate: Fri Sep 20 13:07:24 2019 +0300
[DLAB-1120] Replaced edge public IP with private IP in proxy configurations
---
.../src/general/scripts/gcp/dataengine-service_configure.py | 5 +++--
.../src/general/scripts/gcp/dataengine_configure.py | 6 +++---
.../src/general/scripts/gcp/deeplearning_configure.py | 4 ++--
.../src/general/scripts/gcp/jupyter_configure.py | 4 ++--
.../src/general/scripts/gcp/rstudio_configure.py | 4 ++--
.../src/general/scripts/gcp/tensor-rstudio_configure.py | 4 ++--
.../src/general/scripts/gcp/tensor_configure.py | 4 ++--
.../src/general/scripts/gcp/zeppelin_configure.py | 4 ++--
8 files changed, 18 insertions(+), 17 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 bacace1..aa5ad84 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
@@ -40,7 +40,7 @@ def configure_dataengine_service(instance, dataproc_conf):
try:
logging.info('[CONFIGURE PROXY ON DATAENGINE SERVICE]')
print('[CONFIGURE PROXY ON DATAENGINE SERVICE]')
- additional_config = {"proxy_host":
dataproc_conf['edge_instance_name'], "proxy_port": "3128"}
+ additional_config = {"proxy_host": dataproc_conf['edge_private_ip'],
"proxy_port": "3128"}
params = "--hostname {} --instance_name {} --keyfile {}
--additional_config '{}' --os_user {}"\
.format(dataproc_conf['instance_ip'],
dataproc_conf['cluster_name'], dataproc_conf['key_path'],
json.dumps(additional_config),
dataproc_conf['dlab_ssh_user'])
@@ -99,7 +99,7 @@ def configure_dataengine_service(instance, dataproc_conf):
"--type {} " \
"--exploratory_name {} " \
"--additional_info '{}'"\
- .format(dataproc_conf['edge_instance_hostname'],
+ .format(dataproc_conf['edge_private_ip'],
dataproc_conf['key_path'],
dataproc_conf['dlab_ssh_user'],
'dataengine-service',
@@ -162,6 +162,7 @@ if __name__ == "__main__":
dataproc_conf['project_name'])
dataproc_conf['edge_instance_hostname'] =
GCPMeta().get_instance_public_ip_by_name(
dataproc_conf['edge_instance_name'])
+ dataproc_conf['edge_private_ip'] =
GCPMeta().get_private_ip_address(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'] =
meta_lib.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 b80b021..ca9fd49 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
@@ -84,7 +84,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_name, "proxy_port":
"3128"}
+ additional_config = {"proxy_host": edge_instance_private_ip,
"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'])
@@ -269,7 +269,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_name, "proxy_port":
"3128"}
+ additional_config = {"proxy_host": edge_instance_private_ip,
"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'])
@@ -369,7 +369,7 @@ if __name__ == "__main__":
"--type {} " \
"--exploratory_name {} " \
"--additional_info '{}'"\
- .format(edge_instance_hostname,
+ .format(edge_instance_private_ip,
keyfile_name,
data_engine['dlab_ssh_user'],
'spark',
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
index 052bb74..eaf0e08 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
@@ -99,7 +99,7 @@ if __name__ == "__main__":
try:
logging.info('[CONFIGURE PROXY ON DEEPLEARNING INSTANCE]')
print('[CONFIGURE PROXY ON DEEPLEARNING INSTANCE]')
- additional_config = {"proxy_host": edge_instance_name, "proxy_port":
"3128"}
+ additional_config = {"proxy_host": edge_instance_private_ip,
"proxy_port": "3128"}
params = "--hostname {} --instance_name {} --keyfile {}
--additional_config '{}' --os_user {}" \
.format(instance_hostname, notebook_config['instance_name'],
notebook_config['ssh_key_path'],
json.dumps(additional_config),
notebook_config['dlab_ssh_user'])
@@ -226,7 +226,7 @@ if __name__ == "__main__":
"--type {} " \
"--exploratory_name {} " \
"--additional_info '{}'"\
- .format(edge_instance_hostname,
+ .format(edge_instance_private_ip,
notebook_config['ssh_key_path'],
notebook_config['dlab_ssh_user'],
'jupyter',
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
index a652f3a..9e2ec37 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
@@ -98,7 +98,7 @@ if __name__ == "__main__":
try:
logging.info('[CONFIGURE PROXY ON JUPYTER INSTANCE]')
print('[CONFIGURE PROXY ON JUPYTER INSTANCE]')
- additional_config = {"proxy_host": edge_instance_name, "proxy_port":
"3128"}
+ additional_config = {"proxy_host": edge_instance_private_ip,
"proxy_port": "3128"}
params = "--hostname {} --instance_name {} --keyfile {}
--additional_config '{}' --os_user {}"\
.format(instance_hostname, notebook_config['instance_name'],
notebook_config['ssh_key_path'],
json.dumps(additional_config),
notebook_config['dlab_ssh_user'])
@@ -228,7 +228,7 @@ if __name__ == "__main__":
"--type {} " \
"--exploratory_name {} " \
"--additional_info '{}'"\
- .format(edge_instance_hostname,
+ .format(edge_instance_private_ip,
notebook_config['ssh_key_path'],
notebook_config['dlab_ssh_user'],
'jupyter',
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
index 38d82c0..1b945bb 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
@@ -102,7 +102,7 @@ if __name__ == "__main__":
try:
logging.info('[CONFIGURE PROXY ON RSTUDIO INSTANCE]')
print('[CONFIGURE PROXY ON RSTUDIO INSTANCE]')
- additional_config = {"proxy_host": edge_instance_name, "proxy_port":
"3128"}
+ additional_config = {"proxy_host": edge_instance_private_ip,
"proxy_port": "3128"}
params = "--hostname {} --instance_name {} --keyfile {}
--additional_config '{}' --os_user {}" \
.format(instance_hostname, notebook_config['instance_name'],
notebook_config['ssh_key_path'],
json.dumps(additional_config),
@@ -231,7 +231,7 @@ if __name__ == "__main__":
"--type {} " \
"--exploratory_name {} " \
"--additional_info '{}'"\
- .format(edge_instance_hostname,
+ .format(edge_instance_private_ip,
notebook_config['ssh_key_path'],
notebook_config['dlab_ssh_user'],
'rstudio',
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 12621fa..7af0405 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py
@@ -107,7 +107,7 @@ if __name__ == "__main__":
try:
logging.info('[CONFIGURE PROXY ON TENSORFLOW-RSTUDIO INSTANCE]')
print('[CONFIGURE PROXY ON TENSORFLOW-RSTUDIO INSTANCE]')
- additional_config = {"proxy_host": edge_instance_name, "proxy_port":
"3128"}
+ additional_config = {"proxy_host": edge_instance_private_ip,
"proxy_port": "3128"}
params = "--hostname {} --instance_name {} --keyfile {}
--additional_config '{}' --os_user {}" \
.format(instance_hostname, notebook_config['instance_name'],
notebook_config['ssh_key_path'],
json.dumps(additional_config),
notebook_config['dlab_ssh_user'])
@@ -235,7 +235,7 @@ if __name__ == "__main__":
"--type {} " \
"--exploratory_name {} " \
"--additional_info '{}'"\
- .format(edge_instance_hostname,
+ .format(edge_instance_private_ip,
notebook_config['ssh_key_path'],
notebook_config['dlab_ssh_user'],
'rstudio',
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
index a813067..affd3d4 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
@@ -101,7 +101,7 @@ if __name__ == "__main__":
try:
logging.info('[CONFIGURE PROXY ON TENSOR INSTANCE]')
print('[CONFIGURE PROXY ON TENSOR INSTANCE]')
- additional_config = {"proxy_host": edge_instance_name, "proxy_port":
"3128"}
+ additional_config = {"proxy_host": edge_instance_private_ip,
"proxy_port": "3128"}
params = "--hostname {} --instance_name {} --keyfile {}
--additional_config '{}' --os_user {}" \
.format(instance_hostname, notebook_config['instance_name'],
notebook_config['ssh_key_path'],
json.dumps(additional_config),
notebook_config['dlab_ssh_user'])
@@ -226,7 +226,7 @@ if __name__ == "__main__":
"--type {} " \
"--exploratory_name {} " \
"--additional_info '{}'"\
- .format(edge_instance_hostname,
+ .format(edge_instance_private_ip,
notebook_config['ssh_key_path'],
notebook_config['dlab_ssh_user'],
'jupyter',
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
index 8952177..e0adb5f 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
@@ -101,7 +101,7 @@ if __name__ == "__main__":
try:
logging.info('[CONFIGURE PROXY ON ZEPPELIN INSTANCE]')
print('[CONFIGURE PROXY ON ZEPPELIN INSTANCE]')
- additional_config = {"proxy_host": edge_instance_name, "proxy_port":
"3128"}
+ additional_config = {"proxy_host": edge_instance_private_ip,
"proxy_port": "3128"}
params = "--hostname {} --instance_name {} --keyfile {}
--additional_config '{}' --os_user {}" \
.format(instance_hostname, notebook_config['instance_name'],
notebook_config['ssh_key_path'],
json.dumps(additional_config),
notebook_config['dlab_ssh_user'])
@@ -243,7 +243,7 @@ if __name__ == "__main__":
"--type {} " \
"--exploratory_name {} " \
"--additional_info '{}'"\
- .format(edge_instance_hostname,
+ .format(edge_instance_private_ip,
notebook_config['ssh_key_path'],
notebook_config['dlab_ssh_user'],
'zeppelin',
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
