From 53322c651a6d91e76e2521985c6d23a113aadc56 Mon Sep 17 00:00:00 2001 From: Sylvain Desbureaux Date: Thu, 19 Oct 2017 15:11:02 +0200 Subject: [PATCH] fix location of certs for aai statuses scripts Change-Id: I8a47a6e97997daf9aeb289ba27fc0ac1e566242a Issue-ID: OOM-366 Signed-off-by: Sylvain Desbureaux --- .../consul/consul-agent-config/aai-search-data-service-health.json | 2 +- .../consul-agent-config/{bin => certs}/client-cert-onap.crt.pem | 0 .../consul-agent-config/{bin => certs}/client-cert-onap.key.pem | 0 .../consul-agent-config/scripts/search-data-service-availability.sh | 4 ++-- 4 files changed, 3 insertions(+), 3 deletions(-) rename kubernetes/config/docker/init/src/config/consul/consul-agent-config/{bin => certs}/client-cert-onap.crt.pem (100%) rename kubernetes/config/docker/init/src/config/consul/consul-agent-config/{bin => certs}/client-cert-onap.key.pem (100%) diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-search-data-service-health.json b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-search-data-service-health.json index c74fe8af26..b1877c7424 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-search-data-service-health.json +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-search-data-service-health.json @@ -18,7 +18,7 @@ { "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" }, { diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/bin/client-cert-onap.crt.pem b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/certs/client-cert-onap.crt.pem similarity index 100% rename from kubernetes/config/docker/init/src/config/consul/consul-agent-config/bin/client-cert-onap.crt.pem rename to kubernetes/config/docker/init/src/config/consul/consul-agent-config/certs/client-cert-onap.crt.pem diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/bin/client-cert-onap.key.pem b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/certs/client-cert-onap.key.pem similarity index 100% rename from kubernetes/config/docker/init/src/config/consul/consul-agent-config/bin/client-cert-onap.key.pem rename to kubernetes/config/docker/init/src/config/consul/consul-agent-config/certs/client-cert-onap.key.pem diff --git a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh index e5cf5cfefb..fc0b04a72b 100644 --- a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh +++ b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh @@ -9,8 +9,8 @@ INDEX_URL="https://$SEARCH_SERVICE_NAME:$SEARCH_SERVICE_PORT/services/search-dat 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. -- 2.16.6