You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dm...@apache.org on 2019/07/19 11:01:22 UTC
[incubator-dlab] 02/02: [DLAB-433] Bugfix[inactivity]
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch DLAB-433
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 631594630e0e85b17bb00f9f3ddc4f801b229735
Author: Dyoma33 <de...@gmail.com>
AuthorDate: Fri Jul 19 14:01:09 2019 +0300
[DLAB-433] Bugfix[inactivity]
---
.../src/general/scripts/aws/jupyter-docker_configure.py | 4 ++++
.../src/jupyter-docker/scripts/configure_jupyter-docker_node.py | 1 +
2 files changed, 5 insertions(+)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/jupyter-docker_configure.py b/infrastructure-provisioning/src/general/scripts/aws/jupyter-docker_configure.py
index 877781f..7385cc6 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/jupyter-docker_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/jupyter-docker_configure.py
@@ -66,6 +66,8 @@ if __name__ == "__main__":
notebook_config['tag_name'] = '{}-Tag'.format(notebook_config['service_base_name'])
notebook_config['dlab_ssh_user'] = os.environ['conf_os_user']
notebook_config['shared_image_enabled'] = os.environ['conf_shared_image_enabled']
+ notebook_config['ip_address'] = get_instance_ip_address(notebook_config['tag_name'],
+ notebook_config['instance_name']).get('Private')
# generating variables regarding EDGE proxy on Notebook instance
instance_hostname = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name'])
@@ -151,6 +153,7 @@ if __name__ == "__main__":
"--os_user {} " \
"--scala_version {} " \
"--r_mirror {} " \
+ "--ip_adress {} " \
"--exploratory_name {}".\
format(instance_hostname,
keyfile_name,
@@ -161,6 +164,7 @@ if __name__ == "__main__":
notebook_config['dlab_ssh_user'],
os.environ['notebook_scala_version'],
os.environ['notebook_r_mirror'],
+ notebook_config['ip_address'],
notebook_config['exploratory_name'])
try:
local("~/scripts/{}.py {}".format('configure_jupyter-docker_node', params))
diff --git a/infrastructure-provisioning/src/jupyter-docker/scripts/configure_jupyter-docker_node.py b/infrastructure-provisioning/src/jupyter-docker/scripts/configure_jupyter-docker_node.py
index c42de89..0af26b4 100644
--- a/infrastructure-provisioning/src/jupyter-docker/scripts/configure_jupyter-docker_node.py
+++ b/infrastructure-provisioning/src/jupyter-docker/scripts/configure_jupyter-docker_node.py
@@ -39,6 +39,7 @@ parser.add_argument('--hadoop_version', type=str, default='')
parser.add_argument('--os_user', type=str, default='')
parser.add_argument('--scala_version', type=str, default='')
parser.add_argument('--r_mirror', type=str, default='')
+parser.add_argument('--ip_adress', type=str, default='')
parser.add_argument('--exploratory_name', type=str, default='')
args = parser.parse_args()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org