diff options
author | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2017-10-19 15:11:02 +0200 |
---|---|---|
committer | Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2017-10-19 15:11:02 +0200 |
commit | 53322c651a6d91e76e2521985c6d23a113aadc56 (patch) | |
tree | 98ab0867eeeea0298c76b0e9dde385b80685ed7f | |
parent | 3d2e45507ea65ec3217d6a462cb8adaa249f9c25 (diff) |
fix location of certs for aai statuses scripts
Change-Id: I8a47a6e97997daf9aeb289ba27fc0ac1e566242a
Issue-ID: OOM-366
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
-rw-r--r-- | kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-search-data-service-health.json | 2 | ||||
-rw-r--r-- | kubernetes/config/docker/init/src/config/consul/consul-agent-config/certs/client-cert-onap.crt.pem (renamed from kubernetes/config/docker/init/src/config/consul/consul-agent-config/bin/client-cert-onap.crt.pem) | 0 | ||||
-rw-r--r-- | kubernetes/config/docker/init/src/config/consul/consul-agent-config/certs/client-cert-onap.key.pem (renamed from kubernetes/config/docker/init/src/config/consul/consul-agent-config/bin/client-cert-onap.key.pem) | 0 | ||||
-rw-r--r-- | kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh | 4 |
4 files changed, 3 insertions, 3 deletions
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 index 5696aa3570..5696aa3570 100644 --- 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 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 index c7e386e55f..c7e386e55f 100644 --- 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 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. |