From: Jerry Flood <jflood@att.com>
Date: Mon, 29 Apr 2019 17:00:57 +0000 (-0400)
Subject: Fix java SSL argument name
X-Git-Tag: 2.0.0~5
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F57%2F86557%2F1;p=optf%2Fcmso.git

Fix java SSL argument name

Issue-ID: OPTFRA-391
Change-Id: Idaa14344c76e33b49ae145bf11cefbb2ab597834
Signed-off-by: Jerry Flood <jflood@att.com>
---

diff --git a/cmso-optimizer/src/main/docker/extra-files/startService.sh b/cmso-optimizer/src/main/docker/extra-files/startService.sh
index 7cbed3d..b82ee7b 100644
--- a/cmso-optimizer/src/main/docker/extra-files/startService.sh
+++ b/cmso-optimizer/src/main/docker/extra-files/startService.sh
@@ -21,7 +21,7 @@ fi
 
 if [ "${SSL_KEYSTORE_PASSWORD}" != '' ]
 then
-	VM_ARGS="${VM_ARGS} -Djavax.net.ssl.keyStorePassword=${SSL_KEYSTORE_PASSWORD}"
+	VM_ARGS="${VM_ARGS} -Dserver.ssl.key-store-password=${SSL_KEYSTORE_PASSWORD}"
 fi
 
 echo "VM_ARGS="${VM_ARGS}
diff --git a/cmso-service/src/main/docker/extra-files/startService.sh b/cmso-service/src/main/docker/extra-files/startService.sh
index 7cbed3d..b82ee7b 100644
--- a/cmso-service/src/main/docker/extra-files/startService.sh
+++ b/cmso-service/src/main/docker/extra-files/startService.sh
@@ -21,7 +21,7 @@ fi
 
 if [ "${SSL_KEYSTORE_PASSWORD}" != '' ]
 then
-	VM_ARGS="${VM_ARGS} -Djavax.net.ssl.keyStorePassword=${SSL_KEYSTORE_PASSWORD}"
+	VM_ARGS="${VM_ARGS} -Dserver.ssl.key-store-password=${SSL_KEYSTORE_PASSWORD}"
 fi
 
 echo "VM_ARGS="${VM_ARGS}
diff --git a/cmso-ticketmgt/src/main/docker/extra-files/startService.sh b/cmso-ticketmgt/src/main/docker/extra-files/startService.sh
index 7cbed3d..b82ee7b 100644
--- a/cmso-ticketmgt/src/main/docker/extra-files/startService.sh
+++ b/cmso-ticketmgt/src/main/docker/extra-files/startService.sh
@@ -21,7 +21,7 @@ fi
 
 if [ "${SSL_KEYSTORE_PASSWORD}" != '' ]
 then
-	VM_ARGS="${VM_ARGS} -Djavax.net.ssl.keyStorePassword=${SSL_KEYSTORE_PASSWORD}"
+	VM_ARGS="${VM_ARGS} -Dserver.ssl.key-store-password=${SSL_KEYSTORE_PASSWORD}"
 fi
 
 echo "VM_ARGS="${VM_ARGS}
diff --git a/cmso-topology/src/main/docker/extra-files/startService.sh b/cmso-topology/src/main/docker/extra-files/startService.sh
index 7cbed3d..b82ee7b 100644
--- a/cmso-topology/src/main/docker/extra-files/startService.sh
+++ b/cmso-topology/src/main/docker/extra-files/startService.sh
@@ -21,7 +21,7 @@ fi
 
 if [ "${SSL_KEYSTORE_PASSWORD}" != '' ]
 then
-	VM_ARGS="${VM_ARGS} -Djavax.net.ssl.keyStorePassword=${SSL_KEYSTORE_PASSWORD}"
+	VM_ARGS="${VM_ARGS} -Dserver.ssl.key-store-password=${SSL_KEYSTORE_PASSWORD}"
 fi
 
 echo "VM_ARGS="${VM_ARGS}