This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch DATALAB-2409
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2409 by this push:
new 7e4a05e [DATALAB-2409] - [AWS] SSN configure refactored
7e4a05e is described below
commit 7e4a05e0c475acbab011e87b0c289cfd048c02e6
Author: bodnarmykola <[email protected]>
AuthorDate: Thu Jul 29 11:58:27 2021 +0300
[DATALAB-2409] - [AWS] SSN configure refactored
---
.../src/general/scripts/aws/ssn_configure.py | 19 ++++++++++---------
.../src/general/scripts/aws/ssn_prepare.py | 22 +++++++++++-----------
2 files changed, 21 insertions(+), 20 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index b683ff6..07014c4 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -33,7 +33,7 @@ import traceback
import subprocess
from fabric import *
-def cleanup_aws_cloud_resources(tag_name, service_base_name):
+def cleanup_aws_resources(tag_name, service_base_name):
try:
params = "--tag_name {} --service_base_name {}".format(tag_name,
service_base_name)
subprocess.run("~/scripts/{}.py
{}".format('ssn_terminate_aws_resources', params), shell=True, check=True)
@@ -86,6 +86,7 @@ if __name__ == "__main__":
except Exception as err:
logging.error('Error: {0}'.format(err))
datalab.fab.append_result("Failed to generate variables dictionary.",
str(err))
+ cleanup_aws_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
traceback.print_exc()
sys.exit(1)
@@ -103,7 +104,7 @@ if __name__ == "__main__":
except Exception as err:
logging.error('Error: {0}'.format(err))
datalab.fab.append_result("Failed creating ssh user", str(err))
- remove_cloud_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
+ cleanup_aws_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
sys.exit(1)
#installing prerequisites to ssn instance
@@ -115,7 +116,7 @@ if __name__ == "__main__":
os.environ['pip_packages_fabric'],
os.environ['pip_packages_awscli'],
os.environ['pip_packages_pymongo'], os.environ['pip_packages_pyyaml'],
os.environ['pip_packages_jinja2'])
- params = "--hostname {} --keyfile {} --pip_packages {} --user {}
--region {}".format(
+ params = "--hostname {} --keyfile {} --pip_packages '{}' --user {}
--region {}".format(
ssn_conf['instance_hostname'],
"{}{}.pem".format(os.environ['conf_key_dir'], os.environ['conf_key_name']),
pip_packages, ssn_conf['datalab_ssh_user'], ssn_conf['region'])
try:
@@ -126,7 +127,7 @@ if __name__ == "__main__":
except Exception as err:
logging.error('Error: {0}'.format(err))
datalab.fab.append_result("Failed installing software: pip,
packages.", str(err))
- remove_cloud_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
+ cleanup_aws_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
sys.exit(1)
#configuring ssn instance
@@ -150,7 +151,7 @@ if __name__ == "__main__":
except Exception as err:
logging.error('Error: {0}'.format(err))
datalab.fab.append_result("Failed to configure SSN node.", str(err))
- remove_cloud_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
+ cleanup_aws_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
sys.exit(1)
#configuring docker at ssn instance
@@ -184,7 +185,7 @@ if __name__ == "__main__":
except Exception as err:
logging.error('Error: {0}'.format(err))
datalab.fab.append_result("Failed to configure docker.", str(err))
- remove_cloud_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
+ cleanup_aws_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
sys.exit(1)
#configuring keycloak client for ui
@@ -193,7 +194,7 @@ if __name__ == "__main__":
except Exception as err:
logging.error('Error: {0}'.format(err))
datalab.fab.append_result("Failed to configure Keycloak client for
DataLab UI.", str(err))
- remove_cloud_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
+ cleanup_aws_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
sys.exit(1)
#configuring UI
@@ -529,7 +530,7 @@ if __name__ == "__main__":
except Exception as err:
logging.error('Error: {0}'.format(err))
datalab.fab.append_result("Failed to configure Datalab UI.", str(err))
- remove_cloud_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
+ cleanup_aws_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
sys.exit(1)
#ssn deployment summary
@@ -584,5 +585,5 @@ if __name__ == "__main__":
except Exception as err:
logging.error('Error: {0}'.format(err))
datalab.fab.append_result("Error with writing results.", str(err))
- remove_cloud_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
+ cleanup_aws_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
sys.exit(1)
\ No newline at end of file
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
b/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
index 2ada46c..4686a42 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_prepare.py
@@ -32,7 +32,7 @@ import traceback
import subprocess
from fabric import *
-def cleanup_aws_cloud_resources(tag_name, service_base_name):
+def cleanup_aws_resources(tag_name, service_base_name):
try:
params = "--tag_name {} --service_base_name {}".format(tag_name,
service_base_name)
subprocess.run("~/scripts/{}.py
{}".format('ssn_terminate_aws_resources', params), shell=True, check=True)
@@ -151,7 +151,7 @@ if __name__ == "__main__":
except Exception as err:
logging.error('Error: {0}'.format(err))
datalab.fab.append_result("Failed to create secondary VPC", str(err))
- cleanup_aws_cloud_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
+ cleanup_aws_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
sys.exit(1)
#creating subnet
@@ -177,7 +177,7 @@ if __name__ == "__main__":
except Exception as err:
logging.error('Error: {0}'.format(err))
datalab.fab.append_result("Failed to create Subnet", str(err))
- cleanup_aws_cloud_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
+ cleanup_aws_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
sys.exit(1)
#creating peering connection
@@ -193,7 +193,7 @@ if __name__ == "__main__":
except Exception as err:
logging.error('Error: {0}'.format(err))
datalab.fab.append_result("Failed to create peering connection",
str(err))
- cleanup_aws_cloud_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
+ cleanup_aws_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
sys.exit(1)
#creating security groups
@@ -258,7 +258,7 @@ if __name__ == "__main__":
except Exception as err:
logging.error('Error: {0}'.format(err))
datalab.fab.append_result("Failed to create security group for SSN",
str(err))
- cleanup_aws_cloud_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
+ cleanup_aws_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
sys.exit(1)
#creating roles
@@ -277,7 +277,7 @@ if __name__ == "__main__":
except Exception as err:
logging.error('Error: {0}'.format(err))
datalab.fab.append_result("Failed to create roles", str(err))
- cleanup_aws_cloud_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
+ cleanup_aws_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
sys.exit(1)
#creating endpoint and rout-table
@@ -293,7 +293,7 @@ if __name__ == "__main__":
except Exception as err:
logging.error('Error: {0}'.format(err))
datalab.fab.append_result("Failed to create endpoint", str(err))
- cleanup_aws_cloud_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
+ cleanup_aws_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
sys.exit(1)
# creating endpoint and rout-table notebook vpc
@@ -311,7 +311,7 @@ if __name__ == "__main__":
except Exception as err:
logging.error('Error: {0}'.format(err))
datalab.fab.append_result("Failed to create secondary endpoint",
str(err))
- cleanup_aws_cloud_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
+ cleanup_aws_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
sys.exit(1)
#creating ssn instance
@@ -332,7 +332,7 @@ if __name__ == "__main__":
except Exception as err:
logging.error('Error: {0}'.format(err))
datalab.fab.append_result("Failed to create ssn instance", str(err))
- cleanup_aws_cloud_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
+ cleanup_aws_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
sys.exit(1)
#associating elastic ip
@@ -354,7 +354,7 @@ if __name__ == "__main__":
except Exception as err:
logging.error('Error: {0}'.format(err))
datalab.fab.append_result("Failed to create elastic ip", str(err))
- cleanup_aws_cloud_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
+ cleanup_aws_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
sys.exit(1)
#creating route53 records
@@ -377,5 +377,5 @@ if __name__ == "__main__":
except Exception as err:
logging.error('Error: {0}'.format(err))
datalab.fab.append_result("Failed to create route53 record", str(err))
- cleanup_aws_cloud_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
+ cleanup_aws_resources(ssn_conf['tag_name'],
ssn_conf['service_base_name'])
sys.exit(1)
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
