Modify temp folder for certs 51/104651/1
authoresobmar <mariusz.sobucki@est.tech>
Mon, 30 Mar 2020 14:14:19 +0000 (15:14 +0100)
committerDan Timoney <dtimoney@att.com>
Wed, 1 Apr 2020 13:56:58 +0000 (13:56 +0000)
Issue-ID: SDNC-991
Signed-off-by: esobmar <mariusz.sobucki@est.tech>
Change-Id: I0993a8ec1e38faa93f67ad2d2eaad96af7cae4a1
(cherry picked from commit 68aa50c8ee16169173862312b7ee0acd3ec4f94d [formerly 20fb86922a6993b14c0ea5edf6d5d3bdc6c9ba1f])

Former-commit-id: 2947775e852c496db14a983e538fbac8fdcc1481

installation/sdnc/src/main/scripts/installCerts.py

index a2a25d5..a8133d5 100644 (file)
@@ -36,7 +36,7 @@ with open(os.path.join('/opt/opendaylight/data/log', 'installCerts.log'), 'w') a
 log_format = "%(asctime)s - %(name)s - %(levelname)s - %(message)s"
 logging.basicConfig(filename=log_file,level=logging.DEBUG,filemode='w',format=log_format)
 
-Path = os.environ['ODL_CERT_DIR']
+Path = "/tmp"
 
 zipFileList = []
 
@@ -230,10 +230,10 @@ def get_pass(file_name):
 
 
 def cleanup():
-    for file in os.listdir(Path):
-        if os.path.isfile(Path + '/' + file):
-            logging.debug("Cleaning up the file %s", Path + '/'+ file)
-            os.remove(Path + '/'+ file)
+    for file in jks_files:
+        if os.path.isfile(file):
+            logging.debug("Cleaning up the file %s", file)
+            os.remove(file)
 
 
 def jks_to_p12(file, password):