This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch odahu-integration
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/odahu-integration by this push:
new 3083819 [odahu-integration] Bugfix
3083819 is described below
commit 3083819a1b3bfa632127946796889d5ddcfe22c0
Author: Demyan Mysakovets <demian.mysakove...@gmail.com>
AuthorDate: Wed Apr 15 14:40:23 2020 +0300
[odahu-integration] Bugfix
---
.../src/general/files/aws/odahu_description.json | 8 ++++++++
.../src/general/scripts/aws/ssn_configure.py | 6 ++++--
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 4 +---
3 files changed, 13 insertions(+), 5 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/files/aws/odahu_description.json
b/infrastructure-provisioning/src/general/files/aws/odahu_description.json
new file mode 100644
index 0000000..160a2ec
--- /dev/null
+++ b/infrastructure-provisioning/src/general/files/aws/odahu_description.json
@@ -0,0 +1,8 @@
+{
+ "template_name": "OdahuFlow cluster",
+ "description": "OdahuFlow cluster",
+ "environment_type": "computational",
+ "templates":
+ [
+ ]
+}
\ No newline at end of file
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index a4d6dbc..e14f9b9 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -274,6 +274,7 @@ if __name__ == "__main__":
additional_config = [{"name": "base", "tag": "latest"},
{"name": "edge", "tag": "latest"},
{"name": "project", "tag": "latest"},
+ {"name": "odahu", "tag": "latest"},
{"name": "jupyter", "tag": "latest"},
{"name": "rstudio", "tag": "latest"},
{"name": "zeppelin", "tag": "latest"},
@@ -284,12 +285,13 @@ if __name__ == "__main__":
{"name": "dataengine-service", "tag": "latest"},
{"name": "dataengine", "tag": "latest"}]
params = "--hostname {} --keyfile {} --additional_config '{}'
--os_family {} --os_user {} --dlab_path {} " \
- "--cloud_provider {} --region {}".format(instance_hostname,
+ "--cloud_provider {} --region --gcr_creds {} --odahu_image
{}".format(instance_hostname,
"{}{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name']),
json.dumps(additional_config), os.environ['conf_os_family'],
dlab_ssh_user,
os.environ['ssn_dlab_path'],
-
os.environ['conf_cloud_provider'], os.environ['aws_region'])
+
os.environ['conf_cloud_provider'], os.environ['aws_region'],
+
os.environ['ssn_gcr_creds'], os.environ['odahu_deploy_image'])
try:
local("~/scripts/{}.py {}".format('configure_docker', params))
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 93791a9..a671faf 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -100,9 +100,7 @@ def login_in_gcr(os_user, gcr_creds, odahu_image,
dlab_path):
local('scp -i {} /tmp/config {}:/tmp/config'.format(args.keyfile,
env.host_string))
sudo('mkdir /home/{}/.docker'.format(os_user))
sudo('cat /tmp/config | base64 --decode >
/home/{}/.docker/config.json'.format(os_user))
- sudo('sed -i "s|ODAHU_IMAGE|{}|" '
-
'{}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile'.format(odahu_image,
-
dlab_path))
+ sudo('sed -i "s|ODAHU_IMAGE|{}|"
{}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile'.format(odahu_image,
dlab_path))
except Exception as err:
traceback.print_exc()
print('Failed to prepare odahu image: ', str(err))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
