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

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


The following commit(s) were added to refs/heads/DLAB-1546 by this push:
     new 7bfdc29  [DLAB-1546]: added name convention changes
     new 3e5b854  Merge remote-tracking branch 'origin/DLAB-1546' into DLAB-1546
7bfdc29 is described below

commit 7bfdc292b8b59d676126845bf56b0caae4f42051
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Thu Mar 5 17:07:02 2020 +0200

    [DLAB-1546]: added name convention changes
---
 .../src/general/scripts/aws/project_terminate.py           | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py 
b/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py
index ec93f53..aaff42f 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py
@@ -113,16 +113,16 @@ if __name__ == "__main__":
     project_conf['tag_name'] = project_conf['service_base_name'] + '-tag'
     project_conf['tag_value'] = 
'{}-{}-{}-*'.format(project_conf['service_base_name'], 
project_conf['project_name'],
                                                     
project_conf['endpoint_name'])
-    project_conf['edge_sg'] = 
'{}-{}-{}-edge-sg'.format(project_conf['service_base_name'], 
project_conf['project_name'],
-                                                        
project_conf['endpoint_name'])
-    project_conf['nb_sg'] = 
'{}-{}-{}-nb-sg'.format(project_conf['service_base_name'], 
project_conf['project_name'],
-                                                    
project_conf['endpoint_name'])
+    project_conf['edge_sg'] = 
'{}-{}-{}-edge'.format(project_conf['service_base_name'], 
project_conf['project_name'],
+                                                     
project_conf['endpoint_name'])
+    project_conf['nb_sg'] = 
'{}-{}-{}-nb'.format(project_conf['service_base_name'], 
project_conf['project_name'],
+                                                 project_conf['endpoint_name'])
     project_conf['edge_instance_name'] = 
'{}-{}-{}-edge'.format(project_conf['service_base_name'],
                                                                 
project_conf['project_name'],
                                                                 
project_conf['endpoint_name'])
-    project_conf['de_sg'] = 
'{}-{}-{}-dataengine-*-sg'.format(project_conf['service_base_name'],
-                                                              
project_conf['project_name'],
-                                                              
project_conf['endpoint_name'])
+    project_conf['de_sg'] = 
'{}-{}-{}-de*'.format(project_conf['service_base_name'],
+                                                 project_conf['project_name'],
+                                                 project_conf['endpoint_name'])
     project_conf['emr_sg'] = 
'{}-{}-{}-des-*'.format(project_conf['service_base_name'],
                                                      
project_conf['project_name'],
                                                      
project_conf['endpoint_name'])


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

Reply via email to