aboutsummaryrefslogtreecommitdiffstats
path: root/plans/dcaegen2-collectors-hv-ves
diff options
context:
space:
mode:
authorPiotr Jaszczyk <piotr.jaszczyk@nokia.com>2019-04-10 11:08:49 +0200
committerPiotr Jaszczyk <piotr.jaszczyk@nokia.com>2019-04-10 13:53:44 +0200
commitdbc95ae725e63ca737ba6493ff464ae4b605f02f (patch)
tree3ff8f5e296b62e91386cebc74c9685ccaa165837 /plans/dcaegen2-collectors-hv-ves
parent1258aa7da00c9305ed62ab20b6facaeef5a80d01 (diff)
HV-VES expects passwords to be placed in files
Change-Id: I721bf45dc5618d0afbcc9b4e4174f9557a3bc7c1 Issue-ID: DCAEGEN2-1412 Signed-off-by: Piotr Jaszczyk <piotr.jaszczyk@nokia.com>
Diffstat (limited to 'plans/dcaegen2-collectors-hv-ves')
-rw-r--r--plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json4
-rw-r--r--plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/.gitignore1
-rwxr-xr-xplans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/gen-certs.sh6
3 files changed, 7 insertions, 4 deletions
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json
index 2c2610a0..018f590a 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/configuration/secure.json
@@ -6,7 +6,7 @@
"cbs.firstRequestDelaySec": 3,
"cbs.requestIntervalSec": 5,
"security.keys.keyStoreFile": "/etc/hv-ves/ssl/server.p12",
- "security.keys.keyStorePassword": "onaponap",
+ "security.keys.keyStorePasswordFile": "/etc/hv-ves/ssl/server.pass",
"security.keys.trustStoreFile": "/etc/hv-ves/ssl/trust.p12",
- "security.keys.trustStorePassword": "onaponap"
+ "security.keys.trustStorePasswordFile": "/etc/hv-ves/ssl/trust.pass"
} \ No newline at end of file
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/.gitignore b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/.gitignore
index 0729569c..955c17d1 100644
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/.gitignore
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/.gitignore
@@ -4,3 +4,4 @@
*.csr
*.pkcs12
*.p12
+*.pass
diff --git a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/gen-certs.sh b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/gen-certs.sh
index 9f6bea20..33e3b32b 100755
--- a/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/gen-certs.sh
+++ b/plans/dcaegen2-collectors-hv-ves/testsuites/collector/ssl/gen-certs.sh
@@ -41,6 +41,8 @@ function gen_key() {
keytool -certreq -alias ${key_name} -keyalg RSA ${keystore} | \
keytool -alias ${ca} -gencert -ext "san=dns:${CN_PREFIX}-${ca}" ${store_opts} -keystore ${ca}.p12 | \
keytool -alias ${key_name} -importcert ${keystore}
+
+ printf ${STORE_PASS} > ${key_name}.pass
}
@@ -54,10 +56,11 @@ function gen_truststore() {
local name="$1"
local trusted_ca="$2"
keytool -import -trustcacerts -alias ca -file ${trusted_ca}.crt ${store_opts} -keystore ${name}.p12
+ printf ${STORE_PASS} > ${name}.pass
}
function clean() {
- rm -f *.crt *.p12
+ rm -f *.crt *.p12 *.pass
}
if [[ $# -eq 0 ]]; then
@@ -74,4 +77,3 @@ else
echo "usage: $0 [clean]"
exit 1
fi
-