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 5650fb1 [odahu-integration] Bugfix
5650fb1 is described below
commit 5650fb199feb6fafc86ce894d61d54c1035a2c25
Author: Demyan Mysakovets <demian.mysakove...@gmail.com>
AuthorDate: Thu Jan 30 16:54:43 2020 +0200
[odahu-integration] Bugfix
---
.../src/general/scripts/gcp/ssn_configure.py | 6 +++---
.../src/ssn/scripts/configure_docker.py | 21 +++++++++++++++++++++
.../src/ssn/scripts/configure_ssn_node.py | 21 ---------------------
3 files changed, 24 insertions(+), 24 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index f7a4e8d..2ac2e96 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -193,7 +193,7 @@ if __name__ == "__main__":
"subnet_id": ssn_conf['subnet_name'],
"admin_key": os.environ['conf_key_name']}
params = "--hostname {} --keyfile {} --additional_config '{}'
--os_user {} --dlab_path {} --tag_resource_id {} --ssn_nexus_url {}". \
format(instance_hostname, ssn_conf['ssh_key_path'],
json.dumps(additional_config),
- ssn_conf['dlab_ssh_user'], os.environ['ssn_dlab_path'],
ssn_conf['service_base_name'], os.environ['ssn_nexus_url'])
+ ssn_conf['dlab_ssh_user'], os.environ['ssn_dlab_path'],
ssn_conf['service_base_name'])
try:
local("~/scripts/{}.py {}".format('configure_ssn_node', params))
@@ -234,10 +234,10 @@ if __name__ == "__main__":
{"name": "deeplearning", "tag": "latest"},
{"name": "dataengine", "tag": "latest"},
{"name": "dataengine-service", "tag": "latest"}]
- params = "--hostname {} --keyfile {} --additional_config '{}'
--os_family {} --os_user {} --dlab_path {} --cloud_provider {} --region {}". \
+ params = "--hostname {} --keyfile {} --additional_config '{}'
--os_family {} --os_user {} --dlab_path {} --cloud_provider {} --region {}
--ssn_nexus_url{}". \
format(instance_hostname, ssn_conf['ssh_key_path'],
json.dumps(additional_config),
os.environ['conf_os_family'], ssn_conf['dlab_ssh_user'],
os.environ['ssn_dlab_path'],
- os.environ['conf_cloud_provider'], ssn_conf['region'])
+ os.environ['conf_cloud_provider'], ssn_conf['region'],
os.environ['ssn_nexus_url'])
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 7176c8b..3223e51 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -76,6 +76,24 @@ def add_china_repository(dlab_path):
sudo('sed -i "/pip install/s/jupyter/ipython==5.0.0 jupyter==1.0.0/g"
Dockerfile')
sudo('sed -i "22i COPY general/files/os/debian/sources.list
/etc/apt/sources.list" Dockerfile')
+def prepare_odahu_image(ssn_nexus_url, dlab_path):
+ try:
+ put('/root/templates/daemon.json', '/etc/docker/daemon.json',
use_sudo=True)
+ print('daemon.json was placed')
+ # sudo('mv daemon.json /etc/docker/daemon.json')
+ # print ('daemon.json was moved')
+ sudo("sed -i \'s|<NEXUS_URL>|{}|g\'
/etc/docker/daemon.json".format(os.environ['ssn_nexus_url']))
+ print('nexus url was filled in')
+ sudo('systemctl restart docker')
+ sudo(
+ "sed -i \'s|<NEXUS_URL>|{}|g\'
{}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile".format(
+ ssn_nexus_url, dlab_path))
+ # sudo("sed -i \'s|<ODAHU_REPO>|{}|g\'
{}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile". \
+ # format(os.environ['odahu_docker_private_repo'],
os.environ['ssn_dlab_path']))
+ except Exception as err:
+ traceback.print_exc()
+ print('Failed to prepare odahu image: ', str(err))
+ sys.exit(1)
def build_docker_images(image_list, region, dlab_path):
try:
@@ -173,6 +191,9 @@ if __name__ == "__main__":
if not ensure_docker_daemon(args.dlab_path, args.os_user, args.region):
sys.exit(1)
+ print("Preparing odahu image")
+ prepare_odahu_image(args.ssn_nexus_url, args.dlab_path)
+
print("Building dlab images")
if not build_docker_images(deeper_config, args.region, args.dlab_path):
sys.exit(1)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
index 417c452..8c3b541 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
@@ -147,24 +147,6 @@ def docker_build_script():
print('Failed to configure docker_build script: ', str(err))
sys.exit(1)
-def prepare_odahu_image(ssn_nexus_url, dlab_path):
- try:
- put('/root/templates/daemon.json', '/etc/docker/daemon.json',
use_sudo=True)
- print('daemon.json was placed')
- # sudo('mv daemon.json /etc/docker/daemon.json')
- # print ('daemon.json was moved')
- sudo("sed -i \'s|<NEXUS_URL>|{}|g\'
/etc/docker/daemon.json".format(os.environ['ssn_nexus_url']))
- print('nexus url was filled in')
- sudo('systemctl restart docker')
- sudo(
- "sed -i \'s|<NEXUS_URL>|{}|g\'
{}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile".format(
- ssn_nexus_url, dlab_path))
- # sudo("sed -i \'s|<ODAHU_REPO>|{}|g\'
{}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile". \
- # format(os.environ['odahu_docker_private_repo'],
os.environ['ssn_dlab_path']))
- except Exception as err:
- traceback.print_exc()
- print('Failed to prepare odahu image: ', str(err))
- sys.exit(1)
##############
# Run script #
@@ -225,6 +207,3 @@ if __name__ == "__main__":
print("Configuring docker_build script")
docker_build_script()
-
- print("Preparing odahu image")
- prepare_odahu_image(args.ssn_nexus_url, args.dlab_path)
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
