X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=installation%2Fsdnc%2Fsrc%2Fmain%2Fscripts%2FinstallCerts.py;h=ae5d5b3bf0a574576fb785097a5450b7cc78e296;hb=cb65f50142671a9f8bda4a7a65ead714aae2691a;hp=a2a25d5c8dcf96e7eab43c2b2844f051e2220ba7;hpb=bd1c28b5324bdd8ff2c54cecce0a3625e000c49a;p=sdnc%2Foam.git diff --git a/installation/sdnc/src/main/scripts/installCerts.py b/installation/sdnc/src/main/scripts/installCerts.py index a2a25d5c..ae5d5b3b 100644 --- a/installation/sdnc/src/main/scripts/installCerts.py +++ b/installation/sdnc/src/main/scripts/installCerts.py @@ -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 = [] @@ -221,19 +221,19 @@ def timeIncrement(timePassed): def get_pass(file_name): try: - with open(file_name , 'r') as file_obj: + with open(file_name, 'r') as file_obj: password = file_obj.read().strip() - return password + return "'{}'".format(password) except Exception as e: logging.error("Error occurred while fetching password : %s", e) exit() 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):