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/10/16 12:05:08 UTC
[incubator-dlab] branch DLAB-1120 created (now 5956ace)
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a change to branch DLAB-1120
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 5956ace [DLAB-1120] Fixed dataengine issue and updated docker-build script
This branch includes the following new commits:
new 5956ace [DLAB-1120] Fixed dataengine issue and updated docker-build script
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-1120] Fixed dataengine issue and
updated docker-build script
Posted by dm...@apache.org.
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 5956ace0af7ad2cb442abb39453716429e7f3fd3
Author: Demyan Mysakovets <de...@gmail.com>
AuthorDate: Wed Oct 16 14:56:18 2019 +0300
[DLAB-1120] Fixed dataengine issue and updated docker-build script
---
.../src/general/scripts/azure/dataengine_configure.py | 6 +++---
.../src/general/scripts/gcp/dataengine_configure.py | 5 +++--
infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py | 2 +-
.../src/ssn/{templates => scripts}/docker_build.py | 3 ++-
4 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
index e1e2828..659e48e 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
@@ -218,9 +218,9 @@ if __name__ == "__main__":
data_engine['notebook_name'] = os.environ['notebook_instance_name']
master_node_hostname = AzureMeta().get_private_ip_address(data_engine['resource_group_name'],
data_engine['master_node_name'])
- edge_instance_name = '{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'],
- notebook_config['project_name'],
- notebook_config['endpoint_name'])
+ edge_instance_name = '{0}-{1}-{2}-edge'.format(data_engine['service_base_name'],
+ data_engine['project_name'],
+ data_engine['endpoint_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':
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
index 6053f91..f396bdd 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
@@ -162,6 +162,7 @@ if __name__ == "__main__":
data_engine['service_base_name'] = (os.environ['conf_service_base_name']).lower().replace('_', '-')
data_engine['edge_user_name'] = (os.environ['edge_user_name']).lower().replace('_', '-')
data_engine['project_name'] = (os.environ['project_name']).lower().replace('_', '-')
+ data_engine['endpoint_tag'] = os.environ['endpoint_name'].lower().replace('_', '-')
data_engine['region'] = os.environ['gcp_region']
data_engine['zone'] = os.environ['gcp_zone']
try:
@@ -208,8 +209,8 @@ if __name__ == "__main__":
data_engine['network_tag'] = '{0}-{1}-ps'.format(data_engine['service_base_name'],
data_engine['project_name'])
master_node_hostname = GCPMeta().get_private_ip_address(data_engine['master_node_name'])
- edge_instance_name = '{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'],
- notebook_config['project_name'], notebook_config['endpoint_tag'])
+ edge_instance_name = '{0}-{1}-{2}-edge'.format(data_engine['service_base_name'],
+ data_engine['project_name'], data_engine['endpoint_tag'])
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)
data_engine['dlab_ssh_user'] = os.environ['conf_os_user']
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
index 6f55ab7..d5c454f 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
@@ -138,7 +138,7 @@ def configure_ssl_certs(hostname, custom_ssl_cert):
def docker_build_script():
try:
- put('/root/templates/docker_build.py', 'docker_build')
+ put('/root/scripts/docker_build.py', 'docker_build')
sudo('chmod +x docker_build')
sudo('mv docker_build /usr/bin/docker-build')
except Exception as err:
diff --git a/infrastructure-provisioning/src/ssn/templates/docker_build.py b/infrastructure-provisioning/src/ssn/scripts/docker_build.py
similarity index 97%
rename from infrastructure-provisioning/src/ssn/templates/docker_build.py
rename to infrastructure-provisioning/src/ssn/scripts/docker_build.py
index fd44b42..d5cfb15 100644
--- a/infrastructure-provisioning/src/ssn/templates/docker_build.py
+++ b/infrastructure-provisioning/src/ssn/scripts/docker_build.py
@@ -21,7 +21,7 @@
#
# ******************************************************************************
-
+from os.path import exists
from fabric.api import *
import sys
import os
@@ -31,6 +31,7 @@ src_path = '/opt/dlab/sources/infrastructure-provisioning/src/'
if sys.argv[1] == 'all':
node = [
'edge',
+ 'project',
'jupyter',
'rstudio',
'zeppelin',
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org