diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-01-20 14:19:09 -0600 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-01-20 14:19:09 -0600 |
| commit | 9edfa73d2caeca19472bb369580d10a1c9057c24 (patch) | |
| tree | 79afabddb1a990e4e6a3df531b6d874e8bf474a4 /roles/openshift_logging/files | |
| parent | 7cb710f66261ee6367c0b9ee88bced87f1331134 (diff) | |
| download | openshift-9edfa73d2caeca19472bb369580d10a1c9057c24.tar.gz openshift-9edfa73d2caeca19472bb369580d10a1c9057c24.tar.bz2 openshift-9edfa73d2caeca19472bb369580d10a1c9057c24.tar.xz openshift-9edfa73d2caeca19472bb369580d10a1c9057c24.zip | |
Removing docker run strategy and make java a requirement for control host
Diffstat (limited to 'roles/openshift_logging/files')
| -rw-r--r-- | roles/openshift_logging/files/generate-jks.sh | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/roles/openshift_logging/files/generate-jks.sh b/roles/openshift_logging/files/generate-jks.sh index 995ec0b98..9fe557f83 100644 --- a/roles/openshift_logging/files/generate-jks.sh +++ b/roles/openshift_logging/files/generate-jks.sh @@ -1,6 +1,10 @@ #! /bin/sh set -ex +function usage() { + echo Usage: `basename $0` cert_directory [logging_namespace] 1>&2 +} + function generate_JKS_chain() { dir=${SCRATCH_DIR:-_output} ADD_OID=$1 @@ -147,8 +151,14 @@ function createTruststore() { -noprompt -alias sig-ca } -dir="$CERT_DIR" +if [ $# -lt 1 ]; then + usage + exit 1 +fi + +dir=$1 SCRATCH_DIR=$dir +PROJECT=${2:-logging} if [[ ! -f $dir/system.admin.jks || -z "$(keytool -list -keystore $dir/system.admin.jks -storepass kspass | grep sig-ca)" ]]; then generate_JKS_client_cert "system.admin" |