From: Dan Timoney <dtimoney@att.com>
Date: Tue, 7 Apr 2020 11:19:03 +0000 (+0000)
Subject: Merge "Failure encountered while execution of installCerts.py script fails to convert... 
X-Git-Tag: 2.0.0~42
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d961253675bf41311e9ac55d0f3a81d12b3d3c82;hp=bfb86a07c72262855309b30b1399f3eaab8019c5;p=sdnc%2Foam.git

Merge "Failure encountered while execution of installCerts.py script fails to convert keystore.jks/truststore.jks to keystore.p12/truststore.p12"

Former-commit-id: 56ecc53aed85f4d0686e9a66f92d87ab11bbbebf
---

diff --git a/installation/sdnc/src/main/scripts/installCerts.py b/installation/sdnc/src/main/scripts/installCerts.py
index a8133d5f..ae5d5b3b 100644
--- a/installation/sdnc/src/main/scripts/installCerts.py
+++ b/installation/sdnc/src/main/scripts/installCerts.py
@@ -221,9 +221,9 @@ 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()