From 8205487ce10179d978dc1d1d9aed609e69e9b6fe Mon Sep 17 00:00:00 2001
From: istmxrein <maximilian.reinheimer@stud.h-da.de>
Date: Mon, 26 Sep 2022 18:59:40 +0200
Subject: [PATCH] update requirements
---
cleanup.py | 20 ++++++++++++++------
requirements.txt | 33 ++++-----------------------------
run.py | 2 --
3 files changed, 18 insertions(+), 37 deletions(-)
diff --git a/cleanup.py b/cleanup.py
index ee08402..b0060f7 100644
--- a/cleanup.py
+++ b/cleanup.py
@@ -1,16 +1,24 @@
#!/usr/bin/env python
+import traceback
import openstack
import env
import os
+import sys
def main() -> None:
- conn = openstack.connect()
- for server in conn.compute.servers(name=env.VM_NAME):
- conn.delete_server(server.id, wait=True, delete_ips=True)
- if os.path.exists(env.PRIVATE_KEY_PATH):
- os.remove(env.PRIVATE_KEY_PATH)
- conn.delete_keypair(env.KEY_PAIR_NAME)
+ print("Delete openstack instances", flush=True)
+ try:
+ conn = openstack.connect()
+ for server in conn.compute.servers(name=env.VM_NAME):
+ conn.delete_server(server.id, wait=True, delete_ips=True)
+ if os.path.exists(env.PRIVATE_KEY_PATH):
+ os.remove(env.PRIVATE_KEY_PATH)
+ conn.delete_keypair(env.KEY_PAIR_NAME)
+ conn.close()
+ except Exception as e:
+ traceback.print_exc()
+ sys.exit(int(env.SYSTEM_FAILURE_EXIT_CODE))
if __name__ == "__main__":
diff --git a/requirements.txt b/requirements.txt
index a3b3fe6..39261a7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,29 +1,4 @@
-appdirs==1.4.4
-bcrypt==3.2.0
-certifi==2021.5.30
-cffi==1.14.5
-chardet==4.0.0
-cryptography==3.4.7
-decorator==5.0.9
-dogpile.cache==1.1.3
-idna==2.10
-iso8601==0.1.14
-jmespath==0.10.0
-jsonpatch==1.32
-jsonpointer==2.1
-keystoneauth1==4.3.1
-munch==2.5.0
-netifaces==0.11.0
-openstacksdk==0.57.0
-os-service-types==1.7.0
-paramiko==2.10.3
-pbr==5.6.0
-pycparser==2.20
-PyNaCl==1.4.0
-PyYAML==5.4.1
-requests==2.25.1
-requestsexceptions==1.4.0
-six==1.16.0
-stevedore==3.3.0
-tenacity==8.0.1
-urllib3==1.26.5
+cryptography==38.0.1
+openstacksdk==0.101.0
+paramiko==2.11.0
+tenacity==8.1.0
diff --git a/run.py b/run.py
index b82221f..1127c3d 100644
--- a/run.py
+++ b/run.py
@@ -1,9 +1,7 @@
#!/usr/bin/env python
import sys
-
import openstack
import paramiko
-
import env
--
GitLab