diff options
| author |   kooper <sergey.sachkov@est.tech> | 2019-04-04 14:03:36 +0000 |
|---|---|---|
| committer |   Oren Kleks <orenkle@amdocs.com> | 2019-04-07 08:18:55 +0000 |
| commit | b087a8b55875bd0a100ba2cbfda376bab716741b (patch) | |
| tree | 94c83754510cc19f2b0e57126c6366f49896cff3 /sdc-os-chef/scripts | |
| parent | 2c25cbab17de51f9b9a688644be92d0afdb2fa42 (diff) | |
Certificate location is configurable
Change-Id: I05cf96dd21c891312a5b5e67da3baf7a37e50e54
Issue-ID: SDC-2195
Signed-off-by: kooper <sergey.sachkov@est.tech>
Diffstat (limited to 'sdc-os-chef/scripts')
| -rwxr-xr-x | sdc-os-chef/scripts/docker_run.sh | 6 | ||||
| -rw-r--r-- | sdc-os-chef/scripts/k8s/kubernetes_run.sh | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/sdc-os-chef/scripts/docker_run.sh b/sdc-os-chef/scripts/docker_run.sh index e7c78d9564..6378726b11 100755 --- a/sdc-os-chef/scripts/docker_run.sh +++ b/sdc-os-chef/scripts/docker_run.sh @@ -13,6 +13,7 @@ SDC_USER="asdc_user" SDC_PASSWORD="Aa1234%^!" JETTY_BASE="/var/lib/jetty" +SDC_CERT_DIR="onap/cert" RELEASE=latest LOCAL=false @@ -89,6 +90,9 @@ function dir_perms { mkdir -p ${WORKSPACE}/data/logs/sdc-ui-tests/target mkdir -p ${WORKSPACE}/data/logs/docker_logs mkdir -p ${WORKSPACE}/data/logs/WS + echo "create dir" + echo "${WORKSPACE}data/${SDC_CERT_DIR}" + mkdir -p ${WORKSPACE}/data/${SDC_CERT_DIR} chmod -R 777 ${WORKSPACE}/data/logs } # @@ -427,7 +431,7 @@ function sdc-onboard-BE { else ADDITIONAL_ARGUMENTS=${ONBOARD_DEBUG_PORT} fi - docker run --detach --name ${DOCKER_NAME} --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env cassandra_ssl_enabled="false" --env SDC_CLUSTER_NAME="SDC-CS-${DEP_ENV}" --env SDC_USER="${SDC_USER}" --env SDC_PASSWORD="${SDC_PASSWORD}" --env JAVA_OPTIONS="${ONBOARD_BE_JAVA_OPTIONS}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/logs/ONBOARD:/var/lib/jetty/logs --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 8445:8445 --publish 8081:8081 ${ADDITIONAL_ARGUMENTS} ${PREFIX}/sdc-onboard-backend:${RELEASE} + docker run --detach --name ${DOCKER_NAME} --env HOST_IP=${IP} --env ENVNAME="${DEP_ENV}" --env cassandra_ssl_enabled="false" --env SDC_CLUSTER_NAME="SDC-CS-${DEP_ENV}" --env SDC_USER="${SDC_USER}" --env SDC_PASSWORD="${SDC_PASSWORD}" --env SDC_CERT_DIR="${SDC_CERT_DIR}" --env JAVA_OPTIONS="${ONBOARD_BE_JAVA_OPTIONS}" --log-driver=json-file --log-opt max-size=100m --log-opt max-file=10 --ulimit memlock=-1:-1 --ulimit nofile=4096:100000 ${LOCAL_TIME_MOUNT_CMD} --volume ${WORKSPACE}/data/${SDC_CERT_DIR}:/var/lib/jetty/onap/cert --volume ${WORKSPACE}/data/logs/ONBOARD:/var/lib/jetty/logs --volume ${WORKSPACE}/data/environments:/root/chef-solo/environments --publish 8445:8445 --publish 8081:8081 ${ADDITIONAL_ARGUMENTS} ${PREFIX}/sdc-onboard-backend:${RELEASE} command_exit_status $? ${DOCKER_NAME} echo "please wait while sdc-onboard-BE is starting..." monitor_docker ${DOCKER_NAME} diff --git a/sdc-os-chef/scripts/k8s/kubernetes_run.sh b/sdc-os-chef/scripts/k8s/kubernetes_run.sh index 41797fcdca..afbec358c9 100644 --- a/sdc-os-chef/scripts/k8s/kubernetes_run.sh +++ b/sdc-os-chef/scripts/k8s/kubernetes_run.sh @@ -93,4 +93,5 @@ print_header "SDC - Deploy Pods ..." sudo mkdir -p /dockerdata-nfs/onap/sdc/logs//BE/SDC/SDC-BE sudo mkdir -p /dockerdata-nfs/onap/sdc/logs/FE/SDC/SDC-FE sudo mkdir -p /dockerdata-nfs/onap/sdc/logs/ONBOARD/SDC/ONBOARD-BE +sudo mkdir -p /dockerdata-nfs/onap/sdc/cert sudo chmod -R 777 /dockerdata-nfs/onap/sdc/logs/* |