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 7d977b9  [odahu-integration] Bugfix
7d977b9 is described below

commit 7d977b9cd84ffba060b95da7c40bc6914a6c9eed
Author: Demyan Mysakovets <[email protected]>
AuthorDate: Wed Jan 29 15:25:15 2020 +0200

    [odahu-integration] Bugfix
---
 .../src/general/scripts/gcp/ssn_configure.py             | 10 ++--------
 .../src/ssn/scripts/configure_ssn_node.py                | 16 ++++++++++++++++
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py 
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 69dcae1..f7a4e8d 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -191,9 +191,9 @@ if __name__ == "__main__":
                              "service_base_name": 
ssn_conf['service_base_name'],
                              "security_group_id": ssn_conf['firewall_name'], 
"vpc_id": ssn_conf['vpc_name'],
                              "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 {}". \
+        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'])
+                   ssn_conf['dlab_ssh_user'], os.environ['ssn_dlab_path'], 
ssn_conf['service_base_name'], os.environ['ssn_nexus_url'])
 
         try:
             local("~/scripts/{}.py {}".format('configure_ssn_node', params))
@@ -240,12 +240,6 @@ if __name__ == "__main__":
                    os.environ['conf_cloud_provider'], ssn_conf['region'])
 
         try:
-            put('/root/templates/daemon.json', '/etc/docker/daemon.json')
-            sudo("sed -i \'s|<NEXUS_URL>|{}|g\' 
/etc/docker/daemon.json".format(os.environ['ssn_nexus_url']))
-            sudo('systemctl restart docker')
-            sudo("sed -i \'s|<NEXUS_URL>|{}|g\' 
{}sources/infrastructure-provisioning/src/general/files/gcp/odahu_Dockerfile".format(os.environ['ssn_nexus_url'],
 os.environ['ssn_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']))
             local("~/scripts/{}.py {}".format('configure_docker', params))
         except:
             traceback.print_exc()
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py 
b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
index d5c454f..d68f1a6 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
@@ -37,6 +37,7 @@ parser.add_argument('--additional_config', type=str, 
default='{"empty":"string"}
 parser.add_argument('--os_user', type=str, default='')
 parser.add_argument('--dlab_path', type=str, default='')
 parser.add_argument('--tag_resource_id', type=str, default='')
+parser.add_argument('--ssn_nexus_url', type=str, default='')
 args = parser.parse_args()
 
 
@@ -146,6 +147,21 @@ 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')
+        sudo("sed -i \'s|<NEXUS_URL>|{}|g\' 
/etc/docker/daemon.json".format(os.environ['ssn_nexus_url']))
+        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 #
 ##############


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to