This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DLAB-1628
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1628 by this push:
     new d1c862c  [DLAB-1628]: changed for testing
d1c862c is described below

commit d1c862c0bc1dd1d03f490d2a4a21c7cbf6831d7a
Author: leonidfrolov <[email protected]>
AuthorDate: Tue Mar 17 11:37:42 2020 +0200

    [DLAB-1628]: changed for testing
---
 .../scripts/aws/common_notebook_configure_dataengine-service.py       | 4 ++--
 .../src/general/scripts/aws/common_stop_notebook.py                   | 4 ++--
 .../src/general/scripts/aws/common_terminate_notebook.py              | 4 ++--
 .../src/general/scripts/aws/dataengine-service_configure.py           | 4 ++--
 .../src/general/scripts/aws/dataengine-service_prepare.py             | 4 ++--
 .../src/general/scripts/aws/dataengine-service_terminate.py           | 4 ++--
 6 files changed, 12 insertions(+), 12 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py
 
b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py
index 940516a..a29049a 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py
@@ -59,9 +59,9 @@ if __name__ == "__main__":
         notebook_config['tag_name'] = notebook_config['service_base_name'] + 
'-tag'
         notebook_config['project_name'] = os.environ['project_name']
         notebook_config['endpoint_name'] = os.environ['endpoint_name']
-        notebook_config['bucket_name'] = 
('{0}-{1}-{2}-bucket'.format(notebook_config['service_base_name'],
+        notebook_config['bucket_name'] = 
'{0}-{1}-{2}-bucket'.format(notebook_config['service_base_name'],
                                                                       
notebook_config['project_name'],
-                                                                      
notebook_config['endpoint_name'])).lower()
+                                                                      
notebook_config['endpoint_name']).lower()
         notebook_config['cluster_name'] = 
dlab.meta_lib.get_not_configured_emr(notebook_config['tag_name'],
                                                                                
notebook_config['notebook_name'], True)
         notebook_config['notebook_ip'] = dlab.meta_lib.get_instance_ip_address(
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py 
b/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py
index a3ce304..1d331a6 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py
@@ -103,9 +103,9 @@ if __name__ == "__main__":
     notebook_config['notebook_name'] = os.environ['notebook_instance_name']
     notebook_config['project_name'] = os.environ['project_name']
     notebook_config['endpoint_name'] = os.environ['endpoint_name']
-    notebook_config['bucket_name'] = 
('{0}-{1}-{2}-bucket'.format(notebook_config['service_base_name'],
+    notebook_config['bucket_name'] = 
'{0}-{1}-{2}-bucket'.format(notebook_config['service_base_name'],
                                                                   
notebook_config['project_name'],
-                                                                  
notebook_config['endpoint_name'])).lower()
+                                                                  
notebook_config['endpoint_name']).lower()
     notebook_config['tag_name'] = notebook_config['service_base_name'] + '-tag'
     notebook_config['key_path'] = os.environ['conf_key_dir'] + '/' + 
os.environ['conf_key_name'] + '.pem'
 
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/common_terminate_notebook.py
 
b/infrastructure-provisioning/src/general/scripts/aws/common_terminate_notebook.py
index e9b9950..d93c66c 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/common_terminate_notebook.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/common_terminate_notebook.py
@@ -82,9 +82,9 @@ if __name__ == "__main__":
     notebook_config['notebook_name'] = os.environ['notebook_instance_name']
     notebook_config['project_name'] = os.environ['project_name']
     notebook_config['endpoint_name'] = os.environ['endpoint_name']
-    notebook_config['bucket_name'] = 
('{0}-{1}-{2}-bucket'.format(notebook_config['service_base_name'],
+    notebook_config['bucket_name'] = 
'{0}-{1}-{2}-bucket'.format(notebook_config['service_base_name'],
                                                                   
notebook_config['project_name'],
-                                                                  
notebook_config['endpoint_name'])).lower()
+                                                                  
notebook_config['endpoint_name']).lower()
     notebook_config['tag_name'] = notebook_config['service_base_name'] + '-tag'
 
     try:
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
 
b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
index cc1c85a..f0d36e5 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
@@ -203,8 +203,8 @@ if __name__ == "__main__":
                     emr_conf['endpoint_name'],
                     emr_conf['computational_name'],
                     args.uuid)
-        emr_conf['bucket_name'] = 
('{0}-{1}-{2}-bucket'.format(emr_conf['service_base_name'], 
emr_conf['project_name'],
-                                                               
emr_conf['endpoint_name'])).lower()
+        emr_conf['bucket_name'] = 
'{0}-{1}-{2}-bucket'.format(emr_conf['service_base_name'], 
emr_conf['project_name'],
+                                                               
emr_conf['endpoint_name']).lower()
         tag = {"Key": "{}-tag".format(emr_conf['service_base_name']), "Value": 
"{}-{}-{}-subnet".format(
             emr_conf['service_base_name'], emr_conf['project_name'], 
emr_conf['endpoint_name'])}
         emr_conf['subnet_cidr'] = dlab.meta_lib.get_subnet_by_tag(tag)
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
 
b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
index 83a7a2a..42c357d 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
@@ -113,8 +113,8 @@ if __name__ == "__main__":
                     emr_conf['endpoint_name'],
                     emr_conf['computational_name'],
                     args.uuid)
-        emr_conf['bucket_name'] = 
('{0}-{1}-{2}-bucket'.format(emr_conf['service_base_name'], 
emr_conf['project_name'],
-                                                               
emr_conf['endpoint_name'])).lower()
+        emr_conf['bucket_name'] = 
'{0}-{1}-{2}-bucket'.format(emr_conf['service_base_name'], 
emr_conf['project_name'],
+                                                               
emr_conf['endpoint_name']).lower()
         emr_conf['configurations'] = '[]'
         if 'emr_configurations' in os.environ:
             emr_conf['configurations'] = os.environ['emr_configurations']
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_terminate.py
 
b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_terminate.py
index 985d40f..e66ec7c 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_terminate.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_terminate.py
@@ -78,8 +78,8 @@ if __name__ == "__main__":
     emr_conf['notebook_name'] = os.environ['notebook_instance_name']
     emr_conf['project_name'] = os.environ['project_name']
     emr_conf['endpoint_name'] = os.environ['endpoint_name']
-    emr_conf['bucket_name'] = 
('{0}-{1}-{2}-bucket'.format(emr_conf['service_base_name'], 
emr_conf['project_name'],
-                                                           
emr_conf['endpoint_name'])).lower()
+    emr_conf['bucket_name'] = 
'{0}-{1}-{2}-bucket'.format(emr_conf['service_base_name'], 
emr_conf['project_name'],
+                                                           
emr_conf['endpoint_name']).lower()
     emr_conf['key_path'] = os.environ['conf_key_dir'] + '/' + 
os.environ['conf_key_name'] + '.pem'
     emr_conf['tag_name'] = emr_conf['service_base_name'] + '-tag'
 


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

Reply via email to