summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging/files
diff options
context:
space:
mode:
authorewolinetz <ewolinet@redhat.com>2017-01-04 15:09:47 -0600
committerewolinetz <ewolinet@redhat.com>2017-01-04 15:10:42 -0600
commita8c2999d94548d1c82b75387ef33d2e3f5c67536 (patch)
tree1f0127778f04d9d3898bfd7c74a7ed98dfa13807 /roles/openshift_logging/files
parent2ff313785532674034198300a8b1618cd4ad8abc (diff)
downloadopenshift-a8c2999d94548d1c82b75387ef33d2e3f5c67536.tar.gz
openshift-a8c2999d94548d1c82b75387ef33d2e3f5c67536.tar.bz2
openshift-a8c2999d94548d1c82b75387ef33d2e3f5c67536.tar.xz
openshift-a8c2999d94548d1c82b75387ef33d2e3f5c67536.zip
Fixing collision of system.admin cert generation
Diffstat (limited to 'roles/openshift_logging/files')
-rw-r--r--roles/openshift_logging/files/generate-jks.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_logging/files/generate-jks.sh b/roles/openshift_logging/files/generate-jks.sh
index db7ed9ab8..995ec0b98 100644
--- a/roles/openshift_logging/files/generate-jks.sh
+++ b/roles/openshift_logging/files/generate-jks.sh
@@ -97,7 +97,7 @@ function generate_JKS_client_cert() {
keytool -certreq \
-alias $NODE_NAME \
-keystore $dir/$NODE_NAME.jks \
- -file $dir/$NODE_NAME.csr \
+ -file $dir/$NODE_NAME.jks.csr \
-keyalg rsa \
-keypass $ks_pass \
-storepass $ks_pass \
@@ -105,9 +105,9 @@ function generate_JKS_client_cert() {
echo Sign certificate request with CA
openssl ca \
- -in "$dir/$NODE_NAME.csr" \
+ -in "$dir/$NODE_NAME.jks.csr" \
-notext \
- -out "$dir/$NODE_NAME.crt" \
+ -out "$dir/$NODE_NAME.jks.crt" \
-config $dir/signing.conf \
-extensions v3_req \
-batch \
@@ -124,7 +124,7 @@ function generate_JKS_client_cert() {
keytool \
-import \
- -file $dir/$NODE_NAME.crt \
+ -file $dir/$NODE_NAME.jks.crt \
-keystore $dir/$NODE_NAME.jks \
-storepass $ks_pass \
-noprompt \