path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/model-loader/appconfig/"
- name: filebeat-conf
hostPath:
- path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+ path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
- name: aai-model-loader-logs
emptyDir: {}
- name: aai-model-loader-filebeat
{
"id": "search-data-service-availability",
"name": "Search Data Service Availability",
- "script": "curl -k --cert /consul/config/bin/client-cert-onap.crt.pem --cert-type PEM --key /consul/config/bin/client-cert-onap.key.pem --key-type PEM https://search-data-service.onap-aai:9509/services/search-data-service/v1/jaxrsExample/jaxrs-services/echo/up 2>&1 | grep 'Up'",
+ "script": "curl -k --cert /consul/config/certs/client-cert-onap.crt.pem --cert-type PEM --key /consul/config/bin/client-cert-onap.key.pem --key-type PEM https://search-data-service.onap-aai:9509/services/search-data-service/v1/jaxrsExample/jaxrs-services/echo/up 2>&1 | grep 'Up'",
"interval": "15s"
},
{
INDEX_SCHEMA="{\"fields\":[{\"name\": \"field1\", \"data-type\": \"string\"}]}"
-SEARCH_CERT_FILE="/consul/config/client-cert-onap.crt.pem"
-SEARCH_KEY_FILE="/consul/config/client-cert-onap.key.pem"
+SEARCH_CERT_FILE="/consul/config/certs/client-cert-onap.crt.pem"
+SEARCH_KEY_FILE="/consul/config/certs/client-cert-onap.key.pem"
## Try to create an index via the Search Data Service API.
delete_namespace() {
_NS=$1-$2
kubectl delete namespace $_NS
- printf "Waiting for namespace $_NS termination...\n"
- while kubectl get namespaces $_NS > /dev/null 2>&1; do
- sleep 2
- done
- printf "Namespace $_NS deleted.\n\n"
}
delete_service_account() {
helm delete $1-$2 --purge
}
+wait_terminate() {
+ printf "Waiting for namespaces termination...\n"
+ while true; do
+ declare -i _STATUS=0
+ for i in ${HELM_APPS[@]}; do
+ kubectl get namespaces $1-$i > /dev/null 2>&1
+ if [ "$?" -eq "0" ]; then
+ _STATUS=1
+ break
+ fi
+ done
+ if [ "$_STATUS" -eq "0" ]; then
+ break
+ fi
+ sleep 2
+ done
+}
+
usage() {
cat <<EOF
Usage: $0 [PARAMs]
from the following choices:
sdc, aai ,mso, message-router, robot, vid, aaf, uui
sdnc, portal, policy, appc, multicloud, clamp, consul, vnfsdk
+-N : Do not wait for deletion of namespace and its objects
EOF
}
NS=
INCL_SVC=false
APP=
+WAIT_TERMINATE=true
-while getopts ":n:u:s:a:" PARAM; do
+while getopts ":n:u:s:a:N" PARAM; do
case $PARAM in
u)
usage
exit 1
fi
;;
+ N)
+ WAIT_TERMINATE=false
+ ;;
?)
usage
exit
done
+if $WAIT_TERMINATE; then
+ wait_terminate $NS
+fi
printf "\n********** Gone **********\n"