You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/07/26 10:41:09 UTC
[incubator-dlab] 01/01: Merge pull request #196 from apache/DLAB-947
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 0460d742b728f01e027c215dc9ab2964f685981e
Merge: 747619b 846f6e1
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Fri Jul 26 13:41:03 2019 +0300
Merge pull request #196 from apache/DLAB-947
[DLAB-947] Configured Notebook to use 22 port for Git
.../src/deeplearning/scripts/configure_deep_learning_node.py | 3 ++-
infrastructure-provisioning/src/general/lib/os/fab.py | 8 +++++++-
.../src/general/scripts/aws/deeplearning_configure.py | 5 +++--
.../src/general/scripts/aws/jupyter_configure.py | 7 +++++--
.../src/general/scripts/aws/project_prepare.py | 2 +-
.../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 +++--
.../src/general/scripts/azure/deeplearning_configure.py | 6 ++++--
.../src/general/scripts/azure/edge_prepare.py | 2 +-
.../src/general/scripts/azure/jupyter_configure.py | 6 ++++--
.../src/general/scripts/azure/rstudio_configure.py | 6 ++++--
.../src/general/scripts/azure/tensor_configure.py | 6 ++++--
.../src/general/scripts/azure/zeppelin_configure.py | 6 ++++--
.../src/general/scripts/gcp/deeplearning_configure.py | 5 +++--
.../src/general/scripts/gcp/jupyter_configure.py | 5 +++--
.../src/general/scripts/gcp/project_prepare.py | 2 +-
.../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 | 5 +++--
.../src/jupyter/scripts/configure_jupyter_node.py | 3 ++-
.../src/rstudio/scripts/configure_rstudio_node.py | 3 ++-
.../src/tensor-rstudio/scripts/configure_tensor-rstudio_node.py | 3 ++-
.../src/tensor/scripts/configure_tensor_node.py | 3 ++-
.../src/zeppelin/scripts/configure_zeppelin_node.py | 3 ++-
27 files changed, 77 insertions(+), 44 deletions(-)
diff --cc infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
index d699975,6d4637b..446777a
--- a/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
@@@ -57,8 -56,9 +57,9 @@@ if __name__ == "__main__"
notebook_config['service_base_name'], os.environ['application'])
# generating variables regarding EDGE proxy on Notebook instance
instance_hostname = GCPMeta().get_private_ip_address(notebook_config['instance_name'])
- edge_instance_name = '{0}-{1}-edge'.format(notebook_config['service_base_name'], notebook_config['edge_user_name'])
+ edge_instance_name = '{0}-{1}-edge'.format(notebook_config['service_base_name'], notebook_config['project_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)
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: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org