Code Review
/
oom.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
review
|
tree
raw
|
patch
|
inline
| side by side (parent:
0947cdf
)
Move consul config from shared NFS to configmap
97/34297/4
author
jasmineWen
<jasmine.wen@amdocs.com>
Tue, 6 Mar 2018 16:13:35 +0000
(16:13 +0000)
committer
jasmineWen
<jasmine.wen@amdocs.com>
Mon, 19 Mar 2018 15:42:08 +0000
(15:42 +0000)
Issue-ID: OOM-597
Change-Id: I708c3e9df16003a54462f76c6ffe513b270faae8
Signed-off-by: jasmineWen <jasmine.wen@amdocs.com>
64 files changed:
kubernetes/config/docker/init/src/config/consul/consul-agent-config/bin/kubectl
[deleted file]
patch
|
blob
|
history
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/aai-search-storage-write-script.sh
[deleted file]
patch
|
blob
|
history
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/appc-dbhost-script.sh
[deleted file]
patch
|
blob
|
history
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/gremlin-script.sh
[deleted file]
patch
|
blob
|
history
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdnc-dbhost-script.sh
[deleted file]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/aai-data-router-health.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-data-router-health.json
with 78% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/aai-hbase-health.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-hbase-health.json
with 85% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/aai-model-loader-health.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-model-loader-health.json
with 76% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/aai-search-data-service-health.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-search-data-service-health.json
with 56% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/aai-services-health.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-services-health.json
with 71% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/aai-sparky-be-health.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-sparky-be-health.json
with 77% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/aai-tabular-backend-health.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-tabular-backend-health.json
with 77% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/appc-dbbuilder.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-dbbuilder.json
with 88% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/appc-health.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-health.json
with 77% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/appc-sdnctldb01-healthcheck.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnctldb01-healthcheck.json
with 63% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/appc-sdnctldb02-healthcheck.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnctldb02-healthcheck.json
with 63% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/appc-sdnhost.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnhost.json
with 85% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.crt.pem
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/certs/client-cert-onap.crt.pem
with 100% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.key.pem
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/certs/client-cert-onap.key.pem
with 100% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/log-elastic-search.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-elastic-search.json
with 75% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/log-kibana.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-kibana.json
with 81% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/log-logstash.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-logstash.json
with 73% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/model-loader.properties
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/model-loader.properties
with 100% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/mr-dmaap-health.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-dmaap-health.json
with 68% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/mr-kafka-health.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-kafka-health.json
with 69% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/mr-zookeeper-health.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-zookeeper-health.json
with 68% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/msb-health.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/msb-health.json
with 55% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/mso-health.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mso-health.json
with 73% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/mso-mariabdb.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mso-mariabdb.json
with 77% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/multicloud-health-check.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/multicloud-health-check.json
with 78% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/scripts/aai-search-storage-write-doc.txt
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/aai-search-storage-write-doc.txt
with 100% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/scripts/aai-search-storage-write-script.sh
[new file with mode: 0755]
patch
|
blob
kubernetes/consul/resources/config/consul-agent-config/scripts/appc-dbhost-script.sh
[new file with mode: 0755]
patch
|
blob
kubernetes/consul/resources/config/consul-agent-config/scripts/data-router-script.sh
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/data-router-script.sh
with 50% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/scripts/model-loader-script.sh
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/model-loader-script.sh
with 51% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-kafka-health.sh
with 51% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/scripts/mr-zookeeper-health.sh
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-zookeeper-health.sh
with 52% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/scripts/mso-api-script.sh
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-api-script.sh
with 81% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/scripts/mso-camunda-script.sh
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-camunda-script.sh
with 83% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/scripts/mso-jra-script.sh
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-jra-script.sh
with 82% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/scripts/mso-mariadb-script.sh
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-mariadb-script.sh
with 51% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-be-script.sh
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-be-script.sh
with 87% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-cs-script.sh
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-cs-script.sh
with 88% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-fe-script.sh
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-fe-script.sh
with 87% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-titan-script.sh
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-titan-script.sh
with 88% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/scripts/sdnc-dbhost-script.sh
[new file with mode: 0755]
patch
|
blob
kubernetes/consul/resources/config/consul-agent-config/scripts/search-data-service-availability.sh
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh
with 87% similarity, mode: 0644]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/scripts/sparky-be-script.sh
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sparky-be-script.sh
with 53% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/scripts/tabular-db-availability.sh
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/tabular-db-availability.sh
with 90% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/scripts/vid-mariadb-script.sh
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/vid-mariadb-script.sh
with 51% similarity, mode: 0755]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/sdc-health.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdc-health.json
with 77% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/sdnc-dbhost.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-dbhost.json
with 78% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/sdnc-dgbuilder.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-dgbuilder.json
with 88% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/sdnc-health.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-health.json
with 84% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/sdnc-portal-health.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-portal-health.json
with 86% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnctldb01-healthcheck.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnctldb01-healthcheck.json
with 65% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnctldb02-healthcheck.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnctldb02-healthcheck.json
with 65% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnhost.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnhost.json
with 86% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/vfc-health.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/vfc-health.json
with 50% similarity]
patch
|
blob
|
history
kubernetes/consul/resources/config/consul-agent-config/vid-health.json
[moved from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/vid-health.json
with 82% similarity]
patch
|
blob
|
history
kubernetes/consul/templates/consul-agent-configmap.yaml
[new file with mode: 0644]
patch
|
blob
kubernetes/consul/templates/consul-agent-deployment.yaml
patch
|
blob
|
history
kubernetes/consul/templates/consul-server-deployment.yaml
patch
|
blob
|
history
kubernetes/consul/values.yaml
patch
|
blob
|
history
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/bin/kubectl
b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/bin/kubectl
deleted file mode 100755
(executable)
index
d53ce5f
..0000000
Binary files a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/bin/kubectl and /dev/null differ
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/aai-search-storage-write-script.sh
b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/aai-search-storage-write-script.sh
deleted file mode 100755
(executable)
index
fce0a63
..0000000
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/aai-search-storage-write-script.sh
+++ /dev/null
@@
-1,17
+0,0 @@
-if curl -s -X PUT http://elasticsearch.namespace-placeholder:9200/searchhealth/stats/testwrite -d @/consul/config/scripts/aai-search-storage-write-doc.txt | grep '\"created\":true'; then
- if curl -s -X DELETE http://elasticsearch.namespace-placeholder:9200/searchhealth/stats/testwrite | grep '\"failed\":0'; then
- if curl -s -X GET http://elasticsearch.namespace-placeholder:9200/searchhealth/stats/testwrite | grep '\"found\":false'; then
- echo Successful PUT, DELETE, GET from Search Document Storage 2>&1
- exit 0
- else
- echo Failed GET from Search Document Storage 2>&1
- exit 1
- fi
- else
- echo Failed DELETE from Search Document Storage 2>&1
- exit 1
- fi
-else
- echo Failed PUT from Search Document Storage 2>&1
- exit 1
-fi
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/appc-dbhost-script.sh
b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/appc-dbhost-script.sh
deleted file mode 100755
(executable)
index
9abfd49
..0000000
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/appc-dbhost-script.sh
+++ /dev/null
@@
-1,13
+0,0 @@
-APPC_DBHOST_POD=$(/consul/config/bin/kubectl -n namespace-placeholder get pod | grep -o "appc-dbhost-[^[:space:]]*")
-if [ -n "$APPC_DBHOST_POD" ]; then
- if /consul/config/bin/kubectl -n namespace-placeholder exec -it $APPC_DBHOST_POD -- ./healthcheck.sh |grep -i "mysqld is alive"; then
- echo Success. APPC DBHost is running. 2>&1
- exit 0
- else
- echo Failed. APPC DBHost is not running. 2>&1
- exit 1
- fi
-else
- echo Failed. APPC DBHost is offline. 2>&1
- exit 1
-fi
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/gremlin-script.sh
b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/gremlin-script.sh
deleted file mode 100755
(executable)
index
e55c90f
..0000000
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/gremlin-script.sh
+++ /dev/null
@@
-1,16
+0,0 @@
-
-NAME=$(/consul/config/bin/kubectl -n namespace-placeholder get pod | grep -o "gremlin[^[:space:]]*")
-
-if [ -n "$NAME" ]; then
- if /consul/config/bin/kubectl -n namespace-placeholder exec -it $NAME -- ps -efww | grep 'java' | grep 'gremlin-server' > /dev/null; then
-
- echo Success. Gremlin Server process is running. 2>&1
- exit 0
- else
- echo Failed. Gremlin Server process is not running. 2>&1
- exit 1
- fi
-else
- echo Failed. Gremlin Server container is offline. 2>&1
- exit 1
-fi
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdnc-dbhost-script.sh
b/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdnc-dbhost-script.sh
deleted file mode 100755
(executable)
index
8a523ce
..0000000
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdnc-dbhost-script.sh
+++ /dev/null
@@
-1,13
+0,0 @@
-SDNC_DBHOST_POD=$(/consul/config/bin/kubectl -n namespace-placeholder get pod | grep -o "sdnc-dbhost-[^[:space:]]*")
-if [ -n "$SDNC_DBHOST_POD" ]; then
- if /consul/config/bin/kubectl -n namespace-placeholder exec -it $SDNC_DBHOST_POD -- ./healthcheck.sh |grep -i "mysqld is alive"; then
- echo Success. SDNC DBHost is running. 2>&1
- exit 0
- else
- echo Failed. SDNC DBHost is not running. 2>&1
- exit 1
- fi
-else
- echo Failed. SDNC DBHost is offline. 2>&1
- exit 1
-fi
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-data-router-health.json
b/kubernetes/consul/resources/config/consul-agent-config/aai-data-router-health.json
similarity index 78%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-data-router-health.json
rename to
kubernetes/consul/resources/config/consul-agent-config/aai-data-router-health.json
index
a602036
..
be41934
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-data-router-health.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/aai-data-router-health.json
@@
-5,7
+5,7
@@
{
"id": "data-router-process",
"name": "Synapse Presence",
{
"id": "data-router-process",
"name": "Synapse Presence",
- "script": "/consul/
config/
scripts/data-router-script.sh",
+ "script": "/consul/scripts/data-router-script.sh",
"interval": "15s",
"timeout": "1s"
}
"interval": "15s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-hbase-health.json
b/kubernetes/consul/resources/config/consul-agent-config/aai-hbase-health.json
similarity index 85%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-hbase-health.json
rename to
kubernetes/consul/resources/config/consul-agent-config/aai-hbase-health.json
index
1d23b88
..
6b42e0c
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-hbase-health.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/aai-hbase-health.json
@@
-5,7
+5,7
@@
{
"id": "hbase-aai",
"name": "HBase Health Check",
{
"id": "hbase-aai",
"name": "HBase Health Check",
- "http": "http://hbase.
namespace-placeholder
:8080/status/cluster",
+ "http": "http://hbase.
{{ .Values.nsPrefix }}
:8080/status/cluster",
"method": "GET",
"header": {
"Cache-Control": ["no-cache"],
"method": "GET",
"header": {
"Cache-Control": ["no-cache"],
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-model-loader-health.json
b/kubernetes/consul/resources/config/consul-agent-config/aai-model-loader-health.json
similarity index 76%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-model-loader-health.json
rename to
kubernetes/consul/resources/config/consul-agent-config/aai-model-loader-health.json
index
4e2e305
..
044a844
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-model-loader-health.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/aai-model-loader-health.json
@@
-5,7
+5,7
@@
{
"id": "model-loader-process",
"name": "Model Loader Presence",
{
"id": "model-loader-process",
"name": "Model Loader Presence",
- "script": "/consul/
config/
scripts/model-loader-script.sh",
+ "script": "/consul/scripts/model-loader-script.sh",
"interval": "15s",
"timeout": "1s"
}
"interval": "15s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-search-data-service-health.json
b/kubernetes/consul/resources/config/consul-agent-config/aai-search-data-service-health.json
similarity index 56%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-search-data-service-health.json
rename to
kubernetes/consul/resources/config/consul-agent-config/aai-search-data-service-health.json
index
bf8830f
..
2a111d6
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-search-data-service-health.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/aai-search-data-service-health.json
@@
-5,26
+5,26
@@
{
"id": "elasticsearch",
"name": "Search Data Service Document Store",
{
"id": "elasticsearch",
"name": "Search Data Service Document Store",
- "http": "http://aai-elasticsearch.
namespace-placeholder
:9200/_cat/indices?v",
+ "http": "http://aai-elasticsearch.
{{ .Values.nsPrefix }}
:9200/_cat/indices?v",
"interval": "15s",
"timeout": "1s"
},
{
"id": "elasticsearch-write-health",
"name": "Search Data Service Document Store Write Test",
"interval": "15s",
"timeout": "1s"
},
{
"id": "elasticsearch-write-health",
"name": "Search Data Service Document Store Write Test",
- "script": "/consul/
config/
scripts/aai-search-storage-write-script.sh",
+ "script": "/consul/scripts/aai-search-storage-write-script.sh",
"interval": "60s"
},
{
"id": "search-data-service-availability",
"name": "Search Data Service Availability",
"interval": "60s"
},
{
"id": "search-data-service-availability",
"name": "Search Data Service Availability",
- "script": "curl -k --cert /consul/c
onfig/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.namespace-placeholder
:9509/services/search-data-service/v1/jaxrsExample/jaxrs-services/echo/up 2>&1 | grep 'Up'",
+ "script": "curl -k --cert /consul/c
erts/client-cert-onap.crt.pem --cert-type PEM --key /consul/certs/client-cert-onap.key.pem --key-type PEM https://search-data-service.{{ .Values.nsPrefix }}
:9509/services/search-data-service/v1/jaxrsExample/jaxrs-services/echo/up 2>&1 | grep 'Up'",
"interval": "15s"
},
{
"id": "search-data-service-api",
"name": "Search Data Service Operational Test",
"interval": "15s"
},
{
"id": "search-data-service-api",
"name": "Search Data Service Operational Test",
- "script": "/consul/
config/
scripts/search-data-service-availability.sh",
+ "script": "/consul/scripts/search-data-service-availability.sh",
"interval": "15s",
"timeout": "1s"
}
"interval": "15s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-services-health.json
b/kubernetes/consul/resources/config/consul-agent-config/aai-services-health.json
similarity index 71%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-services-health.json
rename to
kubernetes/consul/resources/config/consul-agent-config/aai-services-health.json
index
99d964e
..
0274cd5
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-services-health.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/aai-services-health.json
@@
-5,7
+5,7
@@
{
"id": "aai-service",
"name": "Core A&AI",
{
"id": "aai-service",
"name": "Core A&AI",
- "http": "https://aai-service.
namespace-placeholder
:8443/aai/util/echo",
+ "http": "https://aai-service.
{{ .Values.nsPrefix }}
:8443/aai/util/echo",
"header": {
"Authorization": ["Basic QUFJOkFBSQ=="],
"X-TransactionId": ["ConsulHealthCheck"],
"header": {
"Authorization": ["Basic QUFJOkFBSQ=="],
"X-TransactionId": ["ConsulHealthCheck"],
@@
-18,7
+18,7
@@
{
"id": "aai-resources",
"name": "Resources Microservice",
{
"id": "aai-resources",
"name": "Resources Microservice",
- "http": "https://aai-resources.
namespace-placeholder
:8447/aai/util/echo",
+ "http": "https://aai-resources.
{{ .Values.nsPrefix }}
:8447/aai/util/echo",
"header": {
"Authorization": ["Basic QUFJOkFBSQ=="],
"X-TransactionId": ["ConsulHealthCheck"],
"header": {
"Authorization": ["Basic QUFJOkFBSQ=="],
"X-TransactionId": ["ConsulHealthCheck"],
@@
-31,7
+31,7
@@
{
"id": "aai-traversal",
"name": "Traversal Microservice",
{
"id": "aai-traversal",
"name": "Traversal Microservice",
- "http": "https://aai-traversal.
namespace-placeholder
:8446/aai/util/echo",
+ "http": "https://aai-traversal.
{{ .Values.nsPrefix }}
:8446/aai/util/echo",
"header": {
"Authorization": ["Basic QUFJOkFBSQ=="],
"X-TransactionId": ["ConsulHealthCheck"],
"header": {
"Authorization": ["Basic QUFJOkFBSQ=="],
"X-TransactionId": ["ConsulHealthCheck"],
@@
-40,13
+40,6
@@
"tls_skip_verify": true,
"interval": "15s",
"timeout": "1s"
"tls_skip_verify": true,
"interval": "15s",
"timeout": "1s"
- },
- {
- "id": "gremlin-server",
- "name": "Graph Data Store",
- "script": "/consul/config/scripts/gremlin-script.sh",
- "interval": "15s",
- "timeout": "1s"
}
]
}
}
]
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-sparky-be-health.json
b/kubernetes/consul/resources/config/consul-agent-config/aai-sparky-be-health.json
similarity index 77%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-sparky-be-health.json
rename to
kubernetes/consul/resources/config/consul-agent-config/aai-sparky-be-health.json
index
6af58db
..
bf6305c
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-sparky-be-health.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/aai-sparky-be-health.json
@@
-5,7
+5,7
@@
{
"id": "sparky-be-process",
"name": "UI Backend Presence",
{
"id": "sparky-be-process",
"name": "UI Backend Presence",
- "script": "/consul/
config/
scripts/sparky-be-script.sh",
+ "script": "/consul/scripts/sparky-be-script.sh",
"interval": "15s",
"timeout": "1s"
}
"interval": "15s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-tabular-backend-health.json
b/kubernetes/consul/resources/config/consul-agent-config/aai-tabular-backend-health.json
similarity index 77%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-tabular-backend-health.json
rename to
kubernetes/consul/resources/config/consul-agent-config/aai-tabular-backend-health.json
index
f76b33b
..
c7fc19b
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/aai-tabular-backend-health.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/aai-tabular-backend-health.json
@@
-5,7
+5,7
@@
{
"id": "tabular-backend",
"name": "Tabular Data Store Operational Test",
{
"id": "tabular-backend",
"name": "Tabular Data Store Operational Test",
- "script": "/consul/
config/
scripts/tabular-db-availability.sh",
+ "script": "/consul/scripts/tabular-db-availability.sh",
"interval": "15s",
"timeout": "1s"
}
"interval": "15s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-dbbuilder.json
b/kubernetes/consul/resources/config/consul-agent-config/appc-dbbuilder.json
similarity index 88%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-dbbuilder.json
rename to
kubernetes/consul/resources/config/consul-agent-config/appc-dbbuilder.json
index
a6c3467
..
9505246
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-dbbuilder.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/appc-dbbuilder.json
@@
-5,7
+5,7
@@
{
"id": "appc-dgbuilder",
"name": "APPC-Dgbuilder Server Health Check",
{
"id": "appc-dgbuilder",
"name": "APPC-Dgbuilder Server Health Check",
- "http": "http://appc-dgbuilder.
namespace-placeholder
:3000/",
+ "http": "http://appc-dgbuilder.
{{ .Values.nsPrefix }}
:3000/",
"method": "HEAD",
"header": {
"Authorization": ["Basic ZGd1c2VyOnRlc3QxMjM="],
"method": "HEAD",
"header": {
"Authorization": ["Basic ZGd1c2VyOnRlc3QxMjM="],
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-health.json
b/kubernetes/consul/resources/config/consul-agent-config/appc-health.json
similarity index 77%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-health.json
rename to
kubernetes/consul/resources/config/consul-agent-config/appc-health.json
index
9d09a59
..
86f2ce8
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-health.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/appc-health.json
@@
-5,7
+5,7
@@
{
"id": "appc-dbhost-healthcheck",
"name": "APPC DBHost Health Check",
{
"id": "appc-dbhost-healthcheck",
"name": "APPC DBHost Health Check",
- "script": "/consul/
config/
scripts/appc-dbhost-script.sh",
+ "script": "/consul/scripts/appc-dbhost-script.sh",
"interval": "10s",
"timeout": "1s"
}
"interval": "10s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnctldb01-healthcheck.json
b/kubernetes/consul/resources/config/consul-agent-config/appc-sdnctldb01-healthcheck.json
similarity index 63%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnctldb01-healthcheck.json
rename to
kubernetes/consul/resources/config/consul-agent-config/appc-sdnctldb01-healthcheck.json
index
31f1b25
..
f36251a
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnctldb01-healthcheck.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/appc-sdnctldb01-healthcheck.json
@@
-3,9
+3,9
@@
"name": "Health Check: APPC-SDN-CTL-DB-01",
"checks": [
{
"name": "Health Check: APPC-SDN-CTL-DB-01",
"checks": [
{
- "id": "appc-sdnctldb01.
namespace-placeholder
",
+ "id": "appc-sdnctldb01.
{{ .Values.nsPrefix }}
",
"name": "APPC SDNCTLDB01 Health Check",
"name": "APPC SDNCTLDB01 Health Check",
- "tcp": "appc-sdnctldb01.
namespace-placeholder
:3306",
+ "tcp": "appc-sdnctldb01.
{{ .Values.nsPrefix }}
:3306",
"interval": "10s",
"timeout": "1s"
}
"interval": "10s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnctldb02-healthcheck.json
b/kubernetes/consul/resources/config/consul-agent-config/appc-sdnctldb02-healthcheck.json
similarity index 63%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnctldb02-healthcheck.json
rename to
kubernetes/consul/resources/config/consul-agent-config/appc-sdnctldb02-healthcheck.json
index
559e5a8
..
8c8171f
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnctldb02-healthcheck.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/appc-sdnctldb02-healthcheck.json
@@
-3,9
+3,9
@@
"name": "Health Check: APPC-SDN-CTL-DB-02",
"checks": [
{
"name": "Health Check: APPC-SDN-CTL-DB-02",
"checks": [
{
- "id": "appc-sdnctldb02.
namespace-placeholder
",
+ "id": "appc-sdnctldb02.
{{ .Values.nsPrefix }}
",
"name": "APPC SDNCTLDB02 Health Check",
"name": "APPC SDNCTLDB02 Health Check",
- "tcp": "appc-sdnctldb02.
namespace-placeholder
:3306",
+ "tcp": "appc-sdnctldb02.
{{ .Values.nsPrefix }}
:3306",
"interval": "10s",
"timeout": "1s"
}
"interval": "10s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnhost.json
b/kubernetes/consul/resources/config/consul-agent-config/appc-sdnhost.json
similarity index 85%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnhost.json
rename to
kubernetes/consul/resources/config/consul-agent-config/appc-sdnhost.json
index
09b5007
..
ec6db9d
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/appc-sdnhost.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/appc-sdnhost.json
@@
-5,7
+5,7
@@
{
"id": "appc-sdnhost",
"name": "APPC SDN Host Health Check",
{
"id": "appc-sdnhost",
"name": "APPC SDN Host Health Check",
- "http": "http://appc-sdnhost.
namespace-placeholder
:8282/apidoc/explorer/index.html",
+ "http": "http://appc-sdnhost.
{{ .Values.nsPrefix }}
:8282/apidoc/explorer/index.html",
"method": "HEAD",
"header": {
"Authorization": ["Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="],
"method": "HEAD",
"header": {
"Authorization": ["Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="],
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/certs/client-cert-onap.crt.pem
b/kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.crt.pem
similarity index 100%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/certs/client-cert-onap.crt.pem
rename to
kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.crt.pem
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/certs/client-cert-onap.key.pem
b/kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.key.pem
similarity index 100%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/certs/client-cert-onap.key.pem
rename to
kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.key.pem
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-elastic-search.json
b/kubernetes/consul/resources/config/consul-agent-config/log-elastic-search.json
similarity index 75%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-elastic-search.json
rename to
kubernetes/consul/resources/config/consul-agent-config/log-elastic-search.json
index
3586f58
..
d14b164
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-elastic-search.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/log-elastic-search.json
@@
-5,7
+5,7
@@
{
"id": "log-elasticsearch-server",
"name": "Log Elastic Search Health Check",
{
"id": "log-elasticsearch-server",
"name": "Log Elastic Search Health Check",
- "http": "http://elasticsearch.
namespace-placeholder
:9200/_cluster/health?pretty",
+ "http": "http://elasticsearch.
{{ .Values.nsPrefix }}
:9200/_cluster/health?pretty",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
@@
-14,7
+14,7
@@
{
"id": "log-elasticsearch-tcp",
"name": "Log Elastic Search TCP Health Check",
{
"id": "log-elasticsearch-tcp",
"name": "Log Elastic Search TCP Health Check",
- "tcp": "elasticsearchtcp.
namespace-placeholder
:9300",
+ "tcp": "elasticsearchtcp.
{{ .Values.nsPrefix }}
:9300",
"interval": "15s",
"timeout": "1s"
}
"interval": "15s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-kibana.json
b/kubernetes/consul/resources/config/consul-agent-config/log-kibana.json
similarity index 81%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-kibana.json
rename to
kubernetes/consul/resources/config/consul-agent-config/log-kibana.json
index
7fda31f
..
cc72bbf
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-kibana.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/log-kibana.json
@@
-5,7
+5,7
@@
{
"id": "log-kibana-server",
"name": "Log kibana Health Check",
{
"id": "log-kibana-server",
"name": "Log kibana Health Check",
- "http": "http://kibana.
namespace-placeholder
:5601/status",
+ "http": "http://kibana.
{{ .Values.nsPrefix }}
:5601/status",
"method": "HEAD",
"tls_skip_verify": true,
"interval": "15s",
"method": "HEAD",
"tls_skip_verify": true,
"interval": "15s",
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-logstash.json
b/kubernetes/consul/resources/config/consul-agent-config/log-logstash.json
similarity index 73%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-logstash.json
rename to
kubernetes/consul/resources/config/consul-agent-config/log-logstash.json
index
e8e6236
..
9eb60fd
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/log-logstash.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/log-logstash.json
@@
-5,7
+5,7
@@
{
"id": "log-logstash-internal-server-gi",
"name": "Log Stash Health Check - General Information",
{
"id": "log-logstash-internal-server-gi",
"name": "Log Stash Health Check - General Information",
- "http": "http://logstashinternal.
namespace-placeholder
:9600/?pretty",
+ "http": "http://logstashinternal.
{{ .Values.nsPrefix }}
:9600/?pretty",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
@@
-14,7
+14,7
@@
{
"id": "log-logstash-internal-server-node-info",
"name": "Log Stash Health Check - Node Information",
{
"id": "log-logstash-internal-server-node-info",
"name": "Log Stash Health Check - Node Information",
- "http": "http://logstashinternal.
namespace-placeholder
:9600/_node/?pretty",
+ "http": "http://logstashinternal.
{{ .Values.nsPrefix }}
:9600/_node/?pretty",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
@@
-23,7
+23,7
@@
{
"id": "log-logstash-internal-server-os-info",
"name": "Log Stash Health Check - OS Information",
{
"id": "log-logstash-internal-server-os-info",
"name": "Log Stash Health Check - OS Information",
- "http": "http://logstashinternal.
namespace-placeholder
:9600/_node/os?pretty",
+ "http": "http://logstashinternal.
{{ .Values.nsPrefix }}
:9600/_node/os?pretty",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
@@
-32,7
+32,7
@@
{
"id": "log-logstash-internal-server-jvm-info",
"name": "Log Stash Health Check - JVM Information",
{
"id": "log-logstash-internal-server-jvm-info",
"name": "Log Stash Health Check - JVM Information",
- "http": "http://logstashinternal.
namespace-placeholder
:9600/_node/jvm?pretty",
+ "http": "http://logstashinternal.
{{ .Values.nsPrefix }}
:9600/_node/jvm?pretty",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
@@
-41,7
+41,7
@@
{
"id": "log-logstash-internal-server-plugin-info",
"name": "Log Stash Health Check - Plugin Information",
{
"id": "log-logstash-internal-server-plugin-info",
"name": "Log Stash Health Check - Plugin Information",
- "http": "http://logstashinternal.
namespace-placeholder
:9600/_node/plugins?pretty",
+ "http": "http://logstashinternal.
{{ .Values.nsPrefix }}
:9600/_node/plugins?pretty",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
@@
-50,7
+50,7
@@
{
"id": "log-logstash-internal-server-node-stat",
"name": "Log Stash Health Check - Node Stats",
{
"id": "log-logstash-internal-server-node-stat",
"name": "Log Stash Health Check - Node Stats",
- "http": "http://logstashinternal.
namespace-placeholder
:9600/_node/stats?pretty",
+ "http": "http://logstashinternal.
{{ .Values.nsPrefix }}
:9600/_node/stats?pretty",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
@@
-59,7
+59,7
@@
{
"id": "log-logstash-internal-server-jvm-stat",
"name": "Log Stash Health Check - JVM Stats",
{
"id": "log-logstash-internal-server-jvm-stat",
"name": "Log Stash Health Check - JVM Stats",
- "http": "http://logstashinternal.
namespace-placeholder
:9600/_node/stats/jvm?pretty",
+ "http": "http://logstashinternal.
{{ .Values.nsPrefix }}
:9600/_node/stats/jvm?pretty",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
@@
-68,7
+68,7
@@
{
"id": "log-logstash-internal-server-process-stat",
"name": "Log Stash Health Check - Process Stats",
{
"id": "log-logstash-internal-server-process-stat",
"name": "Log Stash Health Check - Process Stats",
- "http": "http://logstashinternal.
namespace-placeholder
:9600/_node/stats/process?pretty",
+ "http": "http://logstashinternal.
{{ .Values.nsPrefix }}
:9600/_node/stats/process?pretty",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
@@
-77,7
+77,7
@@
{
"id": "log-logstash-internal-server-os-stat",
"name": "Log Stash Health Check - OS Stats",
{
"id": "log-logstash-internal-server-os-stat",
"name": "Log Stash Health Check - OS Stats",
- "http": "http://logstashinternal.
namespace-placeholder
:9600/_node/stats/os?pretty",
+ "http": "http://logstashinternal.
{{ .Values.nsPrefix }}
:9600/_node/stats/os?pretty",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
"method": "GET",
"tls_skip_verify": true,
"interval": "15s",
@@
-86,7
+86,7
@@
{
"id": "log-logstash-tcp",
"name": "Log Stash File Beat TCP Health Check",
{
"id": "log-logstash-tcp",
"name": "Log Stash File Beat TCP Health Check",
- "tcp": "logstash.
namespace-placeholder
:5044",
+ "tcp": "logstash.
{{ .Values.nsPrefix }}
:5044",
"interval": "15s",
"timeout": "1s"
}
"interval": "15s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/model-loader.properties
b/kubernetes/consul/resources/config/consul-agent-config/model-loader.properties
similarity index 100%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/model-loader.properties
rename to
kubernetes/consul/resources/config/consul-agent-config/model-loader.properties
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-dmaap-health.json
b/kubernetes/consul/resources/config/consul-agent-config/mr-dmaap-health.json
similarity index 68%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-dmaap-health.json
rename to
kubernetes/consul/resources/config/consul-agent-config/mr-dmaap-health.json
index
dddd969
..
ee0d90e
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-dmaap-health.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/mr-dmaap-health.json
@@
-2,7
+2,7
@@
"service": {
"name": "Health Check: Message Router - DMaaP",
"check": {
"service": {
"name": "Health Check: Message Router - DMaaP",
"check": {
- "http": "http://dmaap.
namespace-placeholder
:3904/topics",
+ "http": "http://dmaap.
{{ .Values.nsPrefix }}
:3904/topics",
"interval": "30s",
"timeout": "1s"
}
"interval": "30s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-kafka-health.json
b/kubernetes/consul/resources/config/consul-agent-config/mr-kafka-health.json
similarity index 69%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-kafka-health.json
rename to
kubernetes/consul/resources/config/consul-agent-config/mr-kafka-health.json
index
128cf94
..
df3b190
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-kafka-health.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/mr-kafka-health.json
@@
-2,7
+2,7
@@
"service": {
"name": "Health Check: Message Router - Kafka",
"check": {
"service": {
"name": "Health Check: Message Router - Kafka",
"check": {
- "script": "/consul/
config/
scripts/mr-kafka-health.sh",
+ "script": "/consul/scripts/mr-kafka-health.sh",
"interval": "30s",
"timeout": "1s"
}
"interval": "30s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-zookeeper-health.json
b/kubernetes/consul/resources/config/consul-agent-config/mr-zookeeper-health.json
similarity index 68%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-zookeeper-health.json
rename to
kubernetes/consul/resources/config/consul-agent-config/mr-zookeeper-health.json
index
5268747
..
36d295c
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mr-zookeeper-health.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/mr-zookeeper-health.json
@@
-2,7
+2,7
@@
"service": {
"name": "Health Check: Message Router - ZooKeeper",
"check": {
"service": {
"name": "Health Check: Message Router - ZooKeeper",
"check": {
- "script": "/consul/
config/
scripts/mr-zookeeper-health.sh",
+ "script": "/consul/scripts/mr-zookeeper-health.sh",
"interval": "30s",
"timeout": "1s"
}
"interval": "30s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/msb-health.json
b/kubernetes/consul/resources/config/consul-agent-config/msb-health.json
similarity index 55%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/msb-health.json
rename to
kubernetes/consul/resources/config/consul-agent-config/msb-health.json
index
02e7dc4
..
d15c2ef
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/msb-health.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/msb-health.json
@@
-3,34
+3,34
@@
"name": "Health Check: MSB",
"checks": [
{
"name": "Health Check: MSB",
"checks": [
{
- "id": "msb-eag.
namespace-placeholder
",
+ "id": "msb-eag.
{{ .Values.nsPrefix }}
",
"name": "MSB eag Health Check",
"name": "MSB eag Health Check",
- "http": "http://msb-eag.
namespace-placeholder
:80/iui/microservices/default.html",
+ "http": "http://msb-eag.
{{ .Values.nsPrefix }}
:80/iui/microservices/default.html",
"method": "HEAD",
"tls_skip_verify": true,
"interval": "15s",
"timeout": "1s"
},
{
"method": "HEAD",
"tls_skip_verify": true,
"interval": "15s",
"timeout": "1s"
},
{
- "id": "msb-iag.
namespace-placeholder
",
+ "id": "msb-iag.
{{ .Values.nsPrefix }}
",
"name": "MSB iag Health Check",
"name": "MSB iag Health Check",
- "http": "http://msb-iag.
namespace-placeholder
:80/iui/microservices/default.html",
+ "http": "http://msb-iag.
{{ .Values.nsPrefix }}
:80/iui/microservices/default.html",
"method": "HEAD",
"tls_skip_verify": true,
"interval": "15s",
"timeout": "1s"
},
{
"method": "HEAD",
"tls_skip_verify": true,
"interval": "15s",
"timeout": "1s"
},
{
- "id": "msb-consul.
namespace-placeholder
",
+ "id": "msb-consul.
{{ .Values.nsPrefix }}
",
"name": "MSB consul Health Check",
"name": "MSB consul Health Check",
- "tcp": "msb-consul.
namespace-placeholder
:8500",
+ "tcp": "msb-consul.
{{ .Values.nsPrefix }}
:8500",
"interval": "15s",
"timeout": "1s"
},
{
"interval": "15s",
"timeout": "1s"
},
{
- "id": "msb-discovery.
namespace-placeholder
",
+ "id": "msb-discovery.
{{ .Values.nsPrefix }}
",
"name": "MSB discovery Health Check",
"name": "MSB discovery Health Check",
- "tcp": "msb-discovery.
namespace-placeholder
:10081",
+ "tcp": "msb-discovery.
{{ .Values.nsPrefix }}
:10081",
"interval": "15s",
"timeout": "1s"
}
"interval": "15s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mso-health.json
b/kubernetes/consul/resources/config/consul-agent-config/mso-health.json
similarity index 73%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mso-health.json
rename to
kubernetes/consul/resources/config/consul-agent-config/mso-health.json
index
354cd9e
..
1df7714
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mso-health.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/mso-health.json
@@
-5,21
+5,21
@@
{
"id": "mso-api-healthcheck",
"name": "MSO API Health Check",
{
"id": "mso-api-healthcheck",
"name": "MSO API Health Check",
- "script": "/consul/
config/
scripts/mso-api-script.sh",
+ "script": "/consul/scripts/mso-api-script.sh",
"interval": "10s",
"timeout": "1s"
},
{
"id": "mso-camunda-healthcheck",
"name": "MSO Camunda Health Check",
"interval": "10s",
"timeout": "1s"
},
{
"id": "mso-camunda-healthcheck",
"name": "MSO Camunda Health Check",
- "script": "/consul/
config/
scripts/mso-camunda-script.sh",
+ "script": "/consul/scripts/mso-camunda-script.sh",
"interval": "10s",
"timeout": "1s"
},
{
"id": "mso-jra-healthcheck",
"name": "MSO JRA Health Check",
"interval": "10s",
"timeout": "1s"
},
{
"id": "mso-jra-healthcheck",
"name": "MSO JRA Health Check",
- "script": "/consul/
config/
scripts/mso-jra-script.sh",
+ "script": "/consul/scripts/mso-jra-script.sh",
"interval": "10s",
"timeout": "1s"
}
"interval": "10s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/mso-mariabdb.json
b/kubernetes/consul/resources/config/consul-agent-config/mso-mariabdb.json
similarity index 77%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mso-mariabdb.json
rename to
kubernetes/consul/resources/config/consul-agent-config/mso-mariabdb.json
index
710f4a8
..
54bd2ef
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/mso-mariabdb.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/mso-mariabdb.json
@@
-5,7
+5,7
@@
{
"id": "mso-mariadb",
"name": "MSO Mariadb Health Check",
{
"id": "mso-mariadb",
"name": "MSO Mariadb Health Check",
- "script": "/consul/
config/
scripts/mso-mariadb-script.sh",
+ "script": "/consul/scripts/mso-mariadb-script.sh",
"interval": "10s",
"timeout": "1s"
}
"interval": "10s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/multicloud-health-check.json
b/kubernetes/consul/resources/config/consul-agent-config/multicloud-health-check.json
similarity index 78%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/multicloud-health-check.json
rename to
kubernetes/consul/resources/config/consul-agent-config/multicloud-health-check.json
index
760077c
..
dba7c77
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/multicloud-health-check.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/multicloud-health-check.json
@@
-5,7
+5,7
@@
{
"id": "framework",
"name": "Framework Health Check",
{
"id": "framework",
"name": "Framework Health Check",
- "http": "http://framework.
namespace-placeholder
:9001/api/multicloud/v0/swagger.json",
+ "http": "http://framework.
{{ .Values.nsPrefix }}
:9001/api/multicloud/v0/swagger.json",
"method": "HEAD",
"header": {
"Cache-Control": ["no-cache"],
"method": "HEAD",
"header": {
"Cache-Control": ["no-cache"],
@@
-19,7
+19,7
@@
{
"id": "multicloud-ocata",
"name": "Multicloud Ocata Health Check",
{
"id": "multicloud-ocata",
"name": "Multicloud Ocata Health Check",
- "http": "http://multicloud-ocata.
namespace-placeholder
:9006/api/multicloud-ocata/v0/swagger.json",
+ "http": "http://multicloud-ocata.
{{ .Values.nsPrefix }}
:9006/api/multicloud-ocata/v0/swagger.json",
"method": "HEAD",
"header": {
"Cache-Control": ["no-cache"],
"method": "HEAD",
"header": {
"Cache-Control": ["no-cache"],
@@
-33,7
+33,7
@@
{
"id": "multicloud-vio",
"name": "Multicloud Vio Health Check",
{
"id": "multicloud-vio",
"name": "Multicloud Vio Health Check",
- "http": "http://multicloud-vio.
namespace-placeholder
:9004/api/multicloud-vio/v0/swagger.json",
+ "http": "http://multicloud-vio.
{{ .Values.nsPrefix }}
:9004/api/multicloud-vio/v0/swagger.json",
"method": "HEAD",
"header": {
"Cache-Control": ["no-cache"],
"method": "HEAD",
"header": {
"Cache-Control": ["no-cache"],
@@
-47,7
+47,7
@@
{
"id": "multicloud-windriver",
"name": "Multicloud Windriver Health Check",
{
"id": "multicloud-windriver",
"name": "Multicloud Windriver Health Check",
- "http": "http://multicloud-windriver.
namespace-placeholder
:9005/api/multicloud-titanium_cloud/v0/swagger.json",
+ "http": "http://multicloud-windriver.
{{ .Values.nsPrefix }}
:9005/api/multicloud-titanium_cloud/v0/swagger.json",
"method": "HEAD",
"header": {
"Cache-Control": ["no-cache"],
"method": "HEAD",
"header": {
"Cache-Control": ["no-cache"],
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/aai-search-storage-write-doc.txt
b/kubernetes/consul/resources/config/consul-agent-config/scripts/aai-search-storage-write-doc.txt
similarity index 100%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/aai-search-storage-write-doc.txt
rename to
kubernetes/consul/resources/config/consul-agent-config/scripts/aai-search-storage-write-doc.txt
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/aai-search-storage-write-script.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/aai-search-storage-write-script.sh
new file mode 100755
(executable)
index 0000000..
3d26f6e
--- /dev/null
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/aai-search-storage-write-script.sh
@@ -0,0
+1,17
@@
+if curl -s -X PUT http://aai-elasticsearch.{{ .Values.nsPrefix }}:9200/searchhealth/stats/testwrite -d @/consul/scripts/aai-search-storage-write-doc.txt | grep '\"created\":true'; then
+ if curl -s -X DELETE http://aai-elasticsearch.{{ .Values.nsPrefix }}:9200/searchhealth/stats/testwrite | grep '\"failed\":0'; then
+ if curl -s -X GET http://aai-elasticsearch.{{ .Values.nsPrefix }}:9200/searchhealth/stats/testwrite | grep '\"found\":false'; then
+ echo Successful PUT, DELETE, GET from Search Document Storage 2>&1
+ exit 0
+ else
+ echo Failed GET from Search Document Storage 2>&1
+ exit 1
+ fi
+ else
+ echo Failed DELETE from Search Document Storage 2>&1
+ exit 1
+ fi
+else
+ echo Failed PUT from Search Document Storage 2>&1
+ exit 1
+fi
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/appc-dbhost-script.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/appc-dbhost-script.sh
new file mode 100755
(executable)
index 0000000..
5f91c5e
--- /dev/null
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/appc-dbhost-script.sh
@@ -0,0
+1,13
@@
+APPC_DBHOST_POD=$(/consul/bin/kubectl -n {{ .Values.nsPrefix }} get pod | grep -o "appc-dbhost-[^[:space:]]*")
+if [ -n "$APPC_DBHOST_POD" ]; then
+ if /consul/bin/kubectl -n {{ .Values.nsPrefix }} exec -it $APPC_DBHOST_POD -- ./healthcheck.sh |grep -i "mysqld is alive"; then
+ echo Success. APPC DBHost is running. 2>&1
+ exit 0
+ else
+ echo Failed. APPC DBHost is not running. 2>&1
+ exit 1
+ fi
+else
+ echo Failed. APPC DBHost is offline. 2>&1
+ exit 1
+fi
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/data-router-script.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/data-router-script.sh
similarity index 50%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/data-router-script.sh
rename to
kubernetes/consul/resources/config/consul-agent-config/scripts/data-router-script.sh
index
2c7a949
..
035e7c8
100755
(executable)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/data-router-script.sh
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/data-router-script.sh
@@
-1,8
+1,8
@@
-NAME=$(/consul/
config/bin/kubectl -n namespace-placeholder get pod | grep -o "
data-router[^[:space:]]*")
+NAME=$(/consul/
bin/kubectl -n {{ .Values.nsPrefix }} get pod | grep -o "aai-
data-router[^[:space:]]*")
if [ -n "$NAME" ]; then
if [ -n "$NAME" ]; then
- if /consul/
config/bin/kubectl -n namespace-placeholder
exec -it $NAME -- ps -efww | grep 'java' | grep 'data-router' > /dev/null; then
+ if /consul/
bin/kubectl -n {{ .Values.nsPrefix }}
exec -it $NAME -- ps -efww | grep 'java' | grep 'data-router' > /dev/null; then
echo Success. Synapse process is running. 2>&1
exit 0
echo Success. Synapse process is running. 2>&1
exit 0
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/model-loader-script.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/model-loader-script.sh
similarity index 51%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/model-loader-script.sh
rename to
kubernetes/consul/resources/config/consul-agent-config/scripts/model-loader-script.sh
index
9f4f4a8
..
9a4b4df
100755
(executable)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/model-loader-script.sh
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/model-loader-script.sh
@@
-1,8
+1,8
@@
-NAME=$(/consul/
config/bin/kubectl -n namespace-placeholder get pod | grep -o "
model-loader[^[:space:]]*")
+NAME=$(/consul/
bin/kubectl -n {{ .Values.nsPrefix }} get pod | grep -o "aai-
model-loader[^[:space:]]*")
if [ -n "$NAME" ]; then
if [ -n "$NAME" ]; then
- if /consul/
config/bin/kubectl -n namespace-placeholder
exec -it $NAME -- ps -efww | grep 'java' | grep 'model-loader' > /dev/null; then
+ if /consul/
bin/kubectl -n {{ .Values.nsPrefix }}
exec -it $NAME -- ps -efww | grep 'java' | grep 'model-loader' > /dev/null; then
echo Success. Model Loader process is running. 2>&1
exit 0
echo Success. Model Loader process is running. 2>&1
exit 0
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-kafka-health.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh
similarity index 51%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-kafka-health.sh
rename to
kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh
index
cde6e8f
..
a109032
100755
(executable)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-kafka-health.sh
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh
@@
-1,6
+1,6
@@
-kafkapod=$(/consul/
config/bin/kubectl -n namespace-placeholder get pod | grep -o "
global-kafka-[^[:space:]]*")
+kafkapod=$(/consul/
bin/kubectl -n {{ .Values.nsPrefix }} get pod | grep -o "message-router-
global-kafka-[^[:space:]]*")
if [ -n "$kafkapod" ]; then
if [ -n "$kafkapod" ]; then
- if /consul/
config/bin/kubectl -n namespace-placeholder
exec -it $kafkapod -- ps ef | grep -i kafka; then
+ if /consul/
bin/kubectl -n {{ .Values.nsPrefix }}
exec -it $kafkapod -- ps ef | grep -i kafka; then
echo Success. Kafka process is running. 2>&1
exit 0
else
echo Success. Kafka process is running. 2>&1
exit 0
else
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-zookeeper-health.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-zookeeper-health.sh
similarity index 52%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-zookeeper-health.sh
rename to
kubernetes/consul/resources/config/consul-agent-config/scripts/mr-zookeeper-health.sh
index
2534fcb
..
47c42d5
100755
(executable)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mr-zookeeper-health.sh
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/mr-zookeeper-health.sh
@@
-1,6
+1,6
@@
-zkpod=$(/consul/
config/bin/kubectl -n namespace-placeholder get pod | grep -o "
zookeeper-[^[:space:]]*")
+zkpod=$(/consul/
bin/kubectl -n {{ .Values.nsPrefix }} get pod | grep -o "message-router-
zookeeper-[^[:space:]]*")
if [ -n "$zkpod" ]; then
if [ -n "$zkpod" ]; then
- if /consul/
config/bin/kubectl -n namespace-placeholder
exec -it $zkpod -- ps ef | grep -i zookeeper; then
+ if /consul/
bin/kubectl -n {{ .Values.nsPrefix }}
exec -it $zkpod -- ps ef | grep -i zookeeper; then
echo Success. Zookeeper process is running. 2>&1
exit 0
else
echo Success. Zookeeper process is running. 2>&1
exit 0
else
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-api-script.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/mso-api-script.sh
similarity index 81%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-api-script.sh
rename to
kubernetes/consul/resources/config/consul-agent-config/scripts/mso-api-script.sh
index
459d2e2
..
8f3f85c
100755
(executable)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-api-script.sh
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/mso-api-script.sh
@@
-1,5
+1,5
@@
## Query the health check API.
## Query the health check API.
-HEALTH_CHECK_ENDPOINT="http://mso.
namespace-placeholder
:8080/ecomp/mso/infra/healthcheck"
+HEALTH_CHECK_ENDPOINT="http://mso.
{{ .Values.nsPrefix }}
:8080/ecomp/mso/infra/healthcheck"
HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
READY=$(echo $HEALTH_CHECK_RESPONSE | grep "Application ready")
HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
READY=$(echo $HEALTH_CHECK_RESPONSE | grep "Application ready")
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-camunda-script.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/mso-camunda-script.sh
similarity index 83%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-camunda-script.sh
rename to
kubernetes/consul/resources/config/consul-agent-config/scripts/mso-camunda-script.sh
index
8342843
..
341ff19
100755
(executable)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-camunda-script.sh
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/mso-camunda-script.sh
@@
-1,5
+1,5
@@
## Query the health check API.
## Query the health check API.
-HEALTH_CHECK_ENDPOINT="http://mso.
namespace-placeholder
:8080/mso/healthcheck"
+HEALTH_CHECK_ENDPOINT="http://mso.
{{ .Values.nsPrefix }}
:8080/mso/healthcheck"
HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
READY=$(echo $HEALTH_CHECK_RESPONSE | grep "Application ready")
HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
READY=$(echo $HEALTH_CHECK_RESPONSE | grep "Application ready")
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-jra-script.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/mso-jra-script.sh
similarity index 82%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-jra-script.sh
rename to
kubernetes/consul/resources/config/consul-agent-config/scripts/mso-jra-script.sh
index
c88ebe5
..
beeb289
100755
(executable)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-jra-script.sh
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/mso-jra-script.sh
@@
-1,5
+1,5
@@
## Query the health check API.
## Query the health check API.
-HEALTH_CHECK_ENDPOINT="http://mso.
namespace-placeholder
:8080/networks/rest/healthcheck"
+HEALTH_CHECK_ENDPOINT="http://mso.
{{ .Values.nsPrefix }}
:8080/networks/rest/healthcheck"
HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
READY=$(echo $HEALTH_CHECK_RESPONSE | grep "Application ready")
HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
READY=$(echo $HEALTH_CHECK_RESPONSE | grep "Application ready")
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-mariadb-script.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/mso-mariadb-script.sh
similarity index 51%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-mariadb-script.sh
rename to
kubernetes/consul/resources/config/consul-agent-config/scripts/mso-mariadb-script.sh
index
cabaa4b
..
aa73a73
100755
(executable)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/mso-mariadb-script.sh
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/mso-mariadb-script.sh
@@
-1,7
+1,7
@@
-NAME=$(/consul/
config/bin/kubectl -n namespace-placeholder
get pod | grep -o "mso-mariadb[^[:space:]]*")
+NAME=$(/consul/
bin/kubectl -n {{ .Values.nsPrefix }}
get pod | grep -o "mso-mariadb[^[:space:]]*")
if [ -n "$NAME" ]; then
if [ -n "$NAME" ]; then
- if /consul/
config/bin/kubectl -n namespace-placeholder
exec -it $NAME -- bash -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then
+ if /consul/
bin/kubectl -n {{ .Values.nsPrefix }}
exec -it $NAME -- bash -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then
echo Success. mariadb process is running. 2>&1
exit 0
else
echo Success. mariadb process is running. 2>&1
exit 0
else
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-be-script.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-be-script.sh
similarity index 87%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-be-script.sh
rename to
kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-be-script.sh
index
66f35d9
..
00a0564
100755
(executable)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-be-script.sh
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-be-script.sh
@@
-1,5
+1,5
@@
## Query the health check API.
## Query the health check API.
-HEALTH_CHECK_ENDPOINT="http://sdc-fe.
namespace-placeholder
:8181/sdc1/rest/healthCheck"
+HEALTH_CHECK_ENDPOINT="http://sdc-fe.
{{ .Values.nsPrefix }}
:8181/sdc1/rest/healthCheck"
HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
## Strip out the ON_BOARDING section from the response XML (otherwise we will
HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
## Strip out the ON_BOARDING section from the response XML (otherwise we will
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-cs-script.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-cs-script.sh
similarity index 88%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-cs-script.sh
rename to
kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-cs-script.sh
index
cd50120
..
9950cc9
100755
(executable)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-cs-script.sh
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-cs-script.sh
@@
-1,5
+1,5
@@
## Query the health check API.
## Query the health check API.
-HEALTH_CHECK_ENDPOINT="http://sdc-fe.
namespace-placeholder
:8181/sdc1/rest/healthCheck"
+HEALTH_CHECK_ENDPOINT="http://sdc-fe.
{{ .Values.nsPrefix }}
:8181/sdc1/rest/healthCheck"
HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
## Strip out the ON_BOARDING section from the response XML (otherwise we will
HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
## Strip out the ON_BOARDING section from the response XML (otherwise we will
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-fe-script.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-fe-script.sh
similarity index 87%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-fe-script.sh
rename to
kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-fe-script.sh
index
9799c31
..
27f3b22
100755
(executable)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-fe-script.sh
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-fe-script.sh
@@
-1,5
+1,5
@@
## Query the health check API.
## Query the health check API.
-HEALTH_CHECK_ENDPOINT="http://sdc-fe.
namespace-placeholder
:8181/sdc1/rest/healthCheck"
+HEALTH_CHECK_ENDPOINT="http://sdc-fe.
{{ .Values.nsPrefix }}
:8181/sdc1/rest/healthCheck"
HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
## Strip out the ON_BOARDING section from the response XML (otherwise we will
HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
## Strip out the ON_BOARDING section from the response XML (otherwise we will
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-titan-script.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-titan-script.sh
similarity index 88%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-titan-script.sh
rename to
kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-titan-script.sh
index
bfa2068
..
c5955f3
100755
(executable)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sdc-titan-script.sh
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-titan-script.sh
@@
-1,5
+1,5
@@
## Query the health check API.
## Query the health check API.
-HEALTH_CHECK_ENDPOINT="http://sdc-fe.
namespace-placeholder
:8181/sdc1/rest/healthCheck"
+HEALTH_CHECK_ENDPOINT="http://sdc-fe.
{{ .Values.nsPrefix }}
:8181/sdc1/rest/healthCheck"
HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
## Strip out the ON_BOARDING section from the response XML (otherwise we will
HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
## Strip out the ON_BOARDING section from the response XML (otherwise we will
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/sdnc-dbhost-script.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/sdnc-dbhost-script.sh
new file mode 100755
(executable)
index 0000000..
27b9b9f
--- /dev/null
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/sdnc-dbhost-script.sh
@@ -0,0
+1,13
@@
+SDNC_DBHOST_POD=$(/consul/bin/kubectl -n {{ .Values.nsPrefix }} get pod | grep -o "sdnc-dbhost-[^[:space:]]*")
+if [ -n "$SDNC_DBHOST_POD" ]; then
+ if /consul/bin/kubectl -n {{ .Values.nsPrefix }} exec -it $SDNC_DBHOST_POD -- ./healthcheck.sh |grep -i "mysqld is alive"; then
+ echo Success. SDNC DBHost is running. 2>&1
+ exit 0
+ else
+ echo Failed. SDNC DBHost is not running. 2>&1
+ exit 1
+ fi
+else
+ echo Failed. SDNC DBHost is offline. 2>&1
+ exit 1
+fi
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/search-data-service-availability.sh
old mode 100755
(executable)
new mode 100644
(file)
similarity index 87%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh
rename to
kubernetes/consul/resources/config/consul-agent-config/scripts/search-data-service-availability.sh
index
ef96cca
..
d511873
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/search-data-service-availability.sh
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/search-data-service-availability.sh
@@
-1,6
+1,6
@@
#!/bin/sh
#!/bin/sh
-SEARCH_SERVICE_NAME="search-data-service.
namespace-placeholder
"
+SEARCH_SERVICE_NAME="search-data-service.
{{ .Values.nsPrefix }}
"
SEARCH_SERVICE_PORT=9509
HEALTH_CHECK_INDEX="healthcheck"
SEARCH_SERVICE_PORT=9509
HEALTH_CHECK_INDEX="healthcheck"
@@
-8,13
+8,11
@@
HEALTH_CHECK_INDEX="healthcheck"
INDEX_URL="https://$SEARCH_SERVICE_NAME:$SEARCH_SERVICE_PORT/services/search-data-service/v1/search/indexes/$HEALTH_CHECK_INDEX"
INDEX_SCHEMA="{\"fields\":[{\"name\": \"field1\", \"data-type\": \"string\"}]}"
INDEX_URL="https://$SEARCH_SERVICE_NAME:$SEARCH_SERVICE_PORT/services/search-data-service/v1/search/indexes/$HEALTH_CHECK_INDEX"
INDEX_SCHEMA="{\"fields\":[{\"name\": \"field1\", \"data-type\": \"string\"}]}"
-
-SEARCH_CERT_FILE="/consul/config/certs/client-cert-onap.crt.pem"
-SEARCH_KEY_FILE="/consul/config/certs/client-cert-onap.key.pem"
-
+SEARCH_CERT_FILE="/consul/certs/client-cert-onap.crt.pem"
+SEARCH_KEY_FILE="/consul/certs/client-cert-onap.key.pem"
## Try to create an index via the Search Data Service API.
## Try to create an index via the Search Data Service API.
-CREATE_INDEX_RESP=$(curl -s -o /dev/null -w "%{http_code}" -k --cert $SEARCH_CERT_FILE --cert-type PEM --key $SEARCH_KEY_FILE --key-type PEM -d "$INDEX_SCHEMA" --header "Content-Type: application/json" --header "X-TransactionId: ConsulHealthCheck" -X PUT $INDEX_URL)
+CREATE_INDEX_RESP=$(curl -s -o /dev/null -w "%{http_code}" -k --cert $SEARCH_CERT_FILE --cert-type PEM --key $SEARCH_KEY_FILE --key-type PEM -d "$INDEX_SCHEMA" --header "Content-Type: application/json" --header "X-TransactionId: ConsulHealthCheck" -X PUT $INDEX_URL)
RESULT_STRING=" "
RESULT_STRING=" "
@@
-33,13
+31,13
@@
else
fi
## Now, clean up after ourselves.
fi
## Now, clean up after ourselves.
-DELETE_INDEX_RESP=$(curl -s -o /dev/null -w "%{http_code}" -k --cert $SEARCH_CERT_FILE --cert-type PEM --key $SEARCH_KEY_FILE --key-type PEM -d "{ }" --header "Content-Type: application/json" --header "X-TransactionId: ConsulHealthCheck" -X DELETE $INDEX_URL)
+DELETE_INDEX_RESP=$(curl -s -o /dev/null -w "%{http_code}" -k --cert $SEARCH_CERT_FILE --cert-type PEM --key $SEARCH_KEY_FILE --key-type PEM -d "{ }" --header "Content-Type: application/json" --header "X-TransactionId: ConsulHealthCheck" -X DELETE $INDEX_URL)
if [ $DELETE_INDEX_RESP -eq 200 ]; then
RESULT_STRING="Service Is Able To Communicate With Back End"
if [ $DELETE_INDEX_RESP -eq 200 ]; then
RESULT_STRING="Service Is Able To Communicate With Back End"
-else
+else
RESULT_STRING="Service API Failure - $DELETE_INDEX_RESP"
RESULT_STRING="Service API Failure - $DELETE_INDEX_RESP"
- echo $RESULT_STRING
+ echo $RESULT_STRING
exit 1
fi
exit 1
fi
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sparky-be-script.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/sparky-be-script.sh
similarity index 53%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sparky-be-script.sh
rename to
kubernetes/consul/resources/config/consul-agent-config/scripts/sparky-be-script.sh
index
0791c58
..
7796681
100755
(executable)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/sparky-be-script.sh
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/sparky-be-script.sh
@@
-1,8
+1,8
@@
-NAME=$(/consul/
config/bin/kubectl -n namespace-placeholder
get pod | grep -o "aai-sparky-be[^[:space:]]*")
+NAME=$(/consul/
bin/kubectl -n {{ .Values.nsPrefix }}
get pod | grep -o "aai-sparky-be[^[:space:]]*")
if [ -n "$NAME" ]; then
if [ -n "$NAME" ]; then
- if /consul/
config/bin/kubectl -n namespace-placeholder
exec -it $NAME -- ps -efww | grep 'java' | grep 'sparky' > /dev/null; then
+ if /consul/
bin/kubectl -n {{ .Values.nsPrefix }}
exec -it $NAME -- ps -efww | grep 'java' | grep 'sparky' > /dev/null; then
echo Success. UI Backend Service process is running. 2>&1
exit 0
echo Success. UI Backend Service process is running. 2>&1
exit 0
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/tabular-db-availability.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/tabular-db-availability.sh
similarity index 90%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/tabular-db-availability.sh
rename to
kubernetes/consul/resources/config/consul-agent-config/scripts/tabular-db-availability.sh
index
ebec497
..
dc7768f
100755
(executable)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/tabular-db-availability.sh
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/tabular-db-availability.sh
@@
-1,6
+1,6
@@
# Query the Hbase service for the cluster status.
# Query the Hbase service for the cluster status.
-GET_CLUSTER_STATUS_RESPONSE=$(curl -si -X GET -H "Accept: text/xml" http://
aai-hbase.namespace-placeholder
:8080/status/cluster)
+GET_CLUSTER_STATUS_RESPONSE=$(curl -si -X GET -H "Accept: text/xml" http://
hbase.{{ .Values.nsPrefix }}
:8080/status/cluster)
if [ -z "$GET_CLUSTER_STATUS_RESPONSE" ]; then
echo "Tabular store is unreachable."
if [ -z "$GET_CLUSTER_STATUS_RESPONSE" ]; then
echo "Tabular store is unreachable."
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/vid-mariadb-script.sh
b/kubernetes/consul/resources/config/consul-agent-config/scripts/vid-mariadb-script.sh
old mode 100644
(file)
new mode 100755
(executable)
similarity index 51%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/vid-mariadb-script.sh
rename to
kubernetes/consul/resources/config/consul-agent-config/scripts/vid-mariadb-script.sh
index
96c7969
..
bbb080f
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/scripts/vid-mariadb-script.sh
+++ b/
kubernetes/consul/resources/config/consul-agent-config/scripts/vid-mariadb-script.sh
@@
-1,7
+1,7
@@
-NAME=$(/consul/
config/bin/kubectl -n namespace-placeholder
get pod | grep -o "vid-mariadb[^[:space:]]*")
+NAME=$(/consul/
bin/kubectl -n {{ .Values.nsPrefix }}
get pod | grep -o "vid-mariadb[^[:space:]]*")
if [ -n "$NAME" ]; then
if [ -n "$NAME" ]; then
- if /consul/
config/bin/kubectl -n namespace-placeholder
exec -it $NAME -- bash -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then
+ if /consul/
bin/kubectl -n {{ .Values.nsPrefix }}
exec -it $NAME -- bash -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then
echo Success. mariadb process is running. 2>&1
exit 0
else
echo Success. mariadb process is running. 2>&1
exit 0
else
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdc-health.json
b/kubernetes/consul/resources/config/consul-agent-config/sdc-health.json
similarity index 77%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdc-health.json
rename to
kubernetes/consul/resources/config/consul-agent-config/sdc-health.json
index
374dcdf
..
ec8ec86
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdc-health.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/sdc-health.json
@@
-5,35
+5,35
@@
{
"id": "sdc-fe-healthcheck",
"name": "SDC Front End Health Check",
{
"id": "sdc-fe-healthcheck",
"name": "SDC Front End Health Check",
- "script": "/consul/
config/
scripts/sdc-fe-script.sh",
+ "script": "/consul/scripts/sdc-fe-script.sh",
"interval": "10s",
"timeout": "1s"
},
{
"id": "sdc-be-healthcheck",
"name": "SDC Back End Health Check",
"interval": "10s",
"timeout": "1s"
},
{
"id": "sdc-be-healthcheck",
"name": "SDC Back End Health Check",
- "script": "/consul/
config/
scripts/sdc-be-script.sh",
+ "script": "/consul/scripts/sdc-be-script.sh",
"interval": "10s",
"timeout": "1s"
},
{
"id": "sdc-titan-healthcheck",
"name": "SDC Titan Health Check",
"interval": "10s",
"timeout": "1s"
},
{
"id": "sdc-titan-healthcheck",
"name": "SDC Titan Health Check",
- "script": "/consul/
config/
scripts/sdc-titan-script.sh",
+ "script": "/consul/scripts/sdc-titan-script.sh",
"interval": "10s",
"timeout": "1s"
},
{
"id": "sdc-cs-healthcheck",
"name": "SDC Cassandra Health Check",
"interval": "10s",
"timeout": "1s"
},
{
"id": "sdc-cs-healthcheck",
"name": "SDC Cassandra Health Check",
- "script": "/consul/
config/
scripts/sdc-cs-script.sh",
+ "script": "/consul/scripts/sdc-cs-script.sh",
"interval": "10s",
"timeout": "1s"
},
{
"id": "sdc-catalog-healthcheck",
"name": "SDC Catalog Health Check",
"interval": "10s",
"timeout": "1s"
},
{
"id": "sdc-catalog-healthcheck",
"name": "SDC Catalog Health Check",
- "http": "https://sdc-be.
namespace-placeholder
:8443/asdc/v1/catalog/services",
+ "http": "https://sdc-be.
{{ .Values.nsPrefix }}
:8443/asdc/v1/catalog/services",
"header": {
"Authorization": ["Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="],
"X-ECOMP-InstanceID": ["VID"],
"header": {
"Authorization": ["Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="],
"X-ECOMP-InstanceID": ["VID"],
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-dbhost.json
b/kubernetes/consul/resources/config/consul-agent-config/sdnc-dbhost.json
similarity index 78%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-dbhost.json
rename to
kubernetes/consul/resources/config/consul-agent-config/sdnc-dbhost.json
index
28d711b
..
ea0ae56
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-dbhost.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/sdnc-dbhost.json
@@
-5,7
+5,7
@@
{
"id": "sdnc-dbhost-healthcheck",
"name": "SDNC DBHOST Health Check",
{
"id": "sdnc-dbhost-healthcheck",
"name": "SDNC DBHOST Health Check",
- "script": "/consul/
config/
scripts/sdnc-dbhost-script.sh",
+ "script": "/consul/scripts/sdnc-dbhost-script.sh",
"interval": "10s",
"timeout": "1s"
}
"interval": "10s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-dgbuilder.json
b/kubernetes/consul/resources/config/consul-agent-config/sdnc-dgbuilder.json
similarity index 88%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-dgbuilder.json
rename to
kubernetes/consul/resources/config/consul-agent-config/sdnc-dgbuilder.json
index
6c29399
..
6ae14af
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-dgbuilder.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/sdnc-dgbuilder.json
@@
-5,7
+5,7
@@
{
"id": "sdnc-dgbuilder",
"name": "SDNC-DGbuilder Health Check",
{
"id": "sdnc-dgbuilder",
"name": "SDNC-DGbuilder Health Check",
- "http": "http://sdnc-dgbuilder.
namespace-placeholder
:3000/",
+ "http": "http://sdnc-dgbuilder.
{{ .Values.nsPrefix }}
:3000/",
"method": "HEAD",
"header": {
"Authorization": ["Basic ZGd1c2VyOnRlc3QxMjM="],
"method": "HEAD",
"header": {
"Authorization": ["Basic ZGd1c2VyOnRlc3QxMjM="],
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-health.json
b/kubernetes/consul/resources/config/consul-agent-config/sdnc-health.json
similarity index 84%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-health.json
rename to
kubernetes/consul/resources/config/consul-agent-config/sdnc-health.json
index
a127aa1
..
0ee5e89
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-health.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/sdnc-health.json
@@
-5,7
+5,7
@@
{
"id": "odl-api-healthcheck",
"name": "SDNC API Health Check",
{
"id": "odl-api-healthcheck",
"name": "SDNC API Health Check",
- "http": "http://sdnhost.
namespace-placeholder
:8282/restconf/operations/SLI-API:healthcheck",
+ "http": "http://sdnhost.
{{ .Values.nsPrefix }}
:8282/restconf/operations/SLI-API:healthcheck",
"method": "POST",
"header": {
"Authorization": ["Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="],
"method": "POST",
"header": {
"Authorization": ["Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="],
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-portal-health.json
b/kubernetes/consul/resources/config/consul-agent-config/sdnc-portal-health.json
similarity index 86%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-portal-health.json
rename to
kubernetes/consul/resources/config/consul-agent-config/sdnc-portal-health.json
index
07f2bb7
..
092df05
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-portal-health.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/sdnc-portal-health.json
@@
-5,7
+5,7
@@
{
"id": "sdnc-portal",
"name": "SDNC Portal Health Check",
{
"id": "sdnc-portal",
"name": "SDNC Portal Health Check",
- "http": "http://sdnc-portal.
namespace-placeholder
:8843/login",
+ "http": "http://sdnc-portal.
{{ .Values.nsPrefix }}
:8843/login",
"method": "HEAD",
"header": {
"Cache-Control": ["no-cache"],
"method": "HEAD",
"header": {
"Cache-Control": ["no-cache"],
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnctldb01-healthcheck.json
b/kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnctldb01-healthcheck.json
similarity index 65%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnctldb01-healthcheck.json
rename to
kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnctldb01-healthcheck.json
index
6b859c0
..
ed4a29d
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnctldb01-healthcheck.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnctldb01-healthcheck.json
@@
-3,9
+3,9
@@
"name": "Health Check: SDNC-SDN-CTL-DB-01",
"checks": [
{
"name": "Health Check: SDNC-SDN-CTL-DB-01",
"checks": [
{
- "id": "sdnctldb01.
namespace-placeholder
",
+ "id": "sdnctldb01.
{{ .Values.nsPrefix }}
",
"name": "SDNC SDNCTLDB01 Health Check",
"name": "SDNC SDNCTLDB01 Health Check",
- "tcp": "sdnctldb01.
namespace-placeholder
:3306",
+ "tcp": "sdnctldb01.
{{ .Values.nsPrefix }}
:3306",
"interval": "10s",
"timeout": "1s"
}
"interval": "10s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnctldb02-healthcheck.json
b/kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnctldb02-healthcheck.json
similarity index 65%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnctldb02-healthcheck.json
rename to
kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnctldb02-healthcheck.json
index
c6ad3be
..
8c4700b
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnctldb02-healthcheck.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnctldb02-healthcheck.json
@@
-3,9
+3,9
@@
"name": "Health Check: SDNC-SDN-CTL-DB-02",
"checks": [
{
"name": "Health Check: SDNC-SDN-CTL-DB-02",
"checks": [
{
- "id": "sdnctldb02.
namespace-placeholder
",
+ "id": "sdnctldb02.
{{ .Values.nsPrefix }}
",
"name": "SDNC SDNCTLDB02 Health Check",
"name": "SDNC SDNCTLDB02 Health Check",
- "tcp": "sdnctldb02.
namespace-placeholder
:3306",
+ "tcp": "sdnctldb02.
{{ .Values.nsPrefix }}
:3306",
"interval": "10s",
"timeout": "1s"
}
"interval": "10s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnhost.json
b/kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnhost.json
similarity index 86%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnhost.json
rename to
kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnhost.json
index
9494810
..
585b9c0
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/sdnc-sdnhost.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnhost.json
@@
-5,7
+5,7
@@
{
"id": "sdnc-sdnhost",
"name": "SDNC SDN Host Health Check",
{
"id": "sdnc-sdnhost",
"name": "SDNC SDN Host Health Check",
- "http": "http://sdnhost.
namespace-placeholder
:8282/apidoc/explorer/index.html",
+ "http": "http://sdnhost.
{{ .Values.nsPrefix }}
:8282/apidoc/explorer/index.html",
"method": "HEAD",
"header": {
"Authorization": ["Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="],
"method": "HEAD",
"header": {
"Authorization": ["Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="],
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/vfc-health.json
b/kubernetes/consul/resources/config/consul-agent-config/vfc-health.json
similarity index 50%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/vfc-health.json
rename to
kubernetes/consul/resources/config/consul-agent-config/vfc-health.json
index
abc9e7f
..
5ace3e4
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/vfc-health.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/vfc-health.json
@@
-3,107
+3,107
@@
"name": "Health Check: VFC",
"checks": [
{
"name": "Health Check: VFC",
"checks": [
{
- "id": "vfc-catalog.
namespace-placeholder
",
+ "id": "vfc-catalog.
{{ .Values.nsPrefix }}
",
"name": "VFC catalog Health Check",
"name": "VFC catalog Health Check",
- "tcp": "vfc-catalog.
namespace-placeholder
:8806",
+ "tcp": "vfc-catalog.
{{ .Values.nsPrefix }}
:8806",
"interval": "15s",
"timeout": "1s"
},
{
"interval": "15s",
"timeout": "1s"
},
{
- "id": "vfc-emsdriver.
namespace-placeholder
",
+ "id": "vfc-emsdriver.
{{ .Values.nsPrefix }}
",
"name": "VFC emsdriver Health Check",
"name": "VFC emsdriver Health Check",
- "tcp": "vfc-emsdriver.
namespace-placeholder
:8206",
+ "tcp": "vfc-emsdriver.
{{ .Values.nsPrefix }}
:8206",
"interval": "15s",
"timeout": "1s"
},
{
"interval": "15s",
"timeout": "1s"
},
{
- "id": "vfc-gvnfmdriver.
namespace-placeholder
",
+ "id": "vfc-gvnfmdriver.
{{ .Values.nsPrefix }}
",
"name": "VFC gvnfmdriver Health Check",
"name": "VFC gvnfmdriver Health Check",
- "tcp": "vfc-gvnfmdriver.
namespace-placeholder
:8484",
+ "tcp": "vfc-gvnfmdriver.
{{ .Values.nsPrefix }}
:8484",
"interval": "15s",
"timeout": "1s"
},
{
"interval": "15s",
"timeout": "1s"
},
{
- "id": "vfc-hwvnfmdriver.
namespace-placeholder
",
+ "id": "vfc-hwvnfmdriver.
{{ .Values.nsPrefix }}
",
"name": "VFC hwvnfmdriver Health Check",
"name": "VFC hwvnfmdriver Health Check",
- "tcp": "vfc-hwvnfmdriver.
namespace-placeholder
:8482",
+ "tcp": "vfc-hwvnfmdriver.
{{ .Values.nsPrefix }}
:8482",
"interval": "15s",
"timeout": "1s"
},
{
"interval": "15s",
"timeout": "1s"
},
{
- "id": "vfc-jujudriver.
namespace-placeholder
",
+ "id": "vfc-jujudriver.
{{ .Values.nsPrefix }}
",
"name": "VFC jujudriver Health Check",
"name": "VFC jujudriver Health Check",
- "tcp": "vfc-jujudriver.
namespace-placeholder
:8483",
+ "tcp": "vfc-jujudriver.
{{ .Values.nsPrefix }}
:8483",
"interval": "15s",
"timeout": "1s"
},
{
"interval": "15s",
"timeout": "1s"
},
{
- "id": "vfc-nokiavnfmdriver.
namespace-placeholder
",
+ "id": "vfc-nokiavnfmdriver.
{{ .Values.nsPrefix }}
",
"name": "VFC nokiavnfmdriver Health Check",
"name": "VFC nokiavnfmdriver Health Check",
- "tcp": "vfc-nokiavnfmdriver.
namespace-placeholder
:8486",
+ "tcp": "vfc-nokiavnfmdriver.
{{ .Values.nsPrefix }}
:8486",
"interval": "15s",
"timeout": "1s"
},
{
"interval": "15s",
"timeout": "1s"
},
{
- "id": "vfc-nslcm.
namespace-placeholder
",
+ "id": "vfc-nslcm.
{{ .Values.nsPrefix }}
",
"name": "VFC nslcm Health Check",
"name": "VFC nslcm Health Check",
- "tcp": "vfc-nslcm.
namespace-placeholder
:8403",
+ "tcp": "vfc-nslcm.
{{ .Values.nsPrefix }}
:8403",
"interval": "15s",
"timeout": "1s"
},
{
"interval": "15s",
"timeout": "1s"
},
{
- "id": "vfc-resmgr.
namespace-placeholder
",
+ "id": "vfc-resmgr.
{{ .Values.nsPrefix }}
",
"name": "VFC resmgr Health Check",
"name": "VFC resmgr Health Check",
- "tcp": "vfc-resmgr.
namespace-placeholder
:8480",
+ "tcp": "vfc-resmgr.
{{ .Values.nsPrefix }}
:8480",
"interval": "15s",
"timeout": "1s"
},
{
"interval": "15s",
"timeout": "1s"
},
{
- "id": "vfc-vnflcm.
namespace-placeholder
",
+ "id": "vfc-vnflcm.
{{ .Values.nsPrefix }}
",
"name": "VFC vnflcm Health Check",
"name": "VFC vnflcm Health Check",
- "tcp": "vfc-vnflcm.
namespace-placeholder
:8801",
+ "tcp": "vfc-vnflcm.
{{ .Values.nsPrefix }}
:8801",
"interval": "15s",
"timeout": "1s"
},
{
"interval": "15s",
"timeout": "1s"
},
{
- "id": "vfc-vnfmgr.
namespace-placeholder
",
+ "id": "vfc-vnfmgr.
{{ .Values.nsPrefix }}
",
"name": "VFC vnfmgr Health Check",
"name": "VFC vnfmgr Health Check",
- "tcp": "vfc-vnfmgr.
namespace-placeholder
:8803",
+ "tcp": "vfc-vnfmgr.
{{ .Values.nsPrefix }}
:8803",
"interval": "15s",
"timeout": "1s"
},
{
"interval": "15s",
"timeout": "1s"
},
{
- "id": "vfc-vnfres.
namespace-placeholder
",
+ "id": "vfc-vnfres.
{{ .Values.nsPrefix }}
",
"name": "VFC vnfres Health Check",
"name": "VFC vnfres Health Check",
- "tcp": "vfc-vnfres.
namespace-placeholder
:8802",
+ "tcp": "vfc-vnfres.
{{ .Values.nsPrefix }}
:8802",
"interval": "15s",
"timeout": "1s"
},
{
"interval": "15s",
"timeout": "1s"
},
{
- "id": "vfc-workflow.
namespace-placeholder
",
+ "id": "vfc-workflow.
{{ .Values.nsPrefix }}
",
"name": "VFC workflow Health Check",
"name": "VFC workflow Health Check",
- "tcp": "vfc-workflow.
namespace-placeholder
:10550",
+ "tcp": "vfc-workflow.
{{ .Values.nsPrefix }}
:10550",
"interval": "15s",
"timeout": "1s"
},
{
"interval": "15s",
"timeout": "1s"
},
{
- "id": "vfc-workflowengineactiviti.
namespace-placeholder
",
+ "id": "vfc-workflowengineactiviti.
{{ .Values.nsPrefix }}
",
"name": "VFC workflow-engine Health Check",
"name": "VFC workflow-engine Health Check",
- "tcp": "vfc-workflowengineactiviti.
namespace-placeholder
:8080",
+ "tcp": "vfc-workflowengineactiviti.
{{ .Values.nsPrefix }}
:8080",
"interval": "15s",
"timeout": "1s"
},
{
"interval": "15s",
"timeout": "1s"
},
{
- "id": "vfc-ztesdncdriver.
namespace-placeholder
",
+ "id": "vfc-ztesdncdriver.
{{ .Values.nsPrefix }}
",
"name": "VFC ztesdncdriver Health Check",
"name": "VFC ztesdncdriver Health Check",
- "tcp": "vfc-ztesdncdriver.
namespace-placeholder
:8411",
+ "tcp": "vfc-ztesdncdriver.
{{ .Values.nsPrefix }}
:8411",
"interval": "15s",
"timeout": "1s"
},
{
"interval": "15s",
"timeout": "1s"
},
{
- "id": "vfc-ztevnfmdriver.
namespace-placeholder
",
+ "id": "vfc-ztevnfmdriver.
{{ .Values.nsPrefix }}
",
"name": "VFC ztevnfmdriver Health Check",
"name": "VFC ztevnfmdriver Health Check",
- "tcp": "vfc-ztevnfmdriver.
namespace-placeholder
:8410",
+ "tcp": "vfc-ztevnfmdriver.
{{ .Values.nsPrefix }}
:8410",
"interval": "15s",
"timeout": "1s"
}
"interval": "15s",
"timeout": "1s"
}
diff --git
a/kubernetes/config/docker/init/src/config/consul/consul-agent-config/vid-health.json
b/kubernetes/consul/resources/config/consul-agent-config/vid-health.json
similarity index 82%
rename from
kubernetes/config/docker/init/src/config/consul/consul-agent-config/vid-health.json
rename to
kubernetes/consul/resources/config/consul-agent-config/vid-health.json
index
39d71c4
..
2dc6f0a
100644
(file)
--- a/
kubernetes/config/docker/init/src/config/consul/consul-agent-config/vid-health.json
+++ b/
kubernetes/consul/resources/config/consul-agent-config/vid-health.json
@@
-5,7
+5,7
@@
{
"id": "vid-server",
"name": "VID Server Health Check",
{
"id": "vid-server",
"name": "VID Server Health Check",
- "http": "http://vid-server.
namespace-placeholder
:8080/vid/healthCheck",
+ "http": "http://vid-server.
{{ .Values.nsPrefix }}
:8080/vid/healthCheck",
"method": "GET",
"header": {
"Authorization": ["Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="],
"method": "GET",
"header": {
"Authorization": ["Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="],
@@
-20,7
+20,7
@@
{
"id": "vid-mariadb",
"name": "Vid Mariadb Health Check",
{
"id": "vid-mariadb",
"name": "Vid Mariadb Health Check",
- "script": "/consul/
config/
scripts/vid-mariadb-script.sh",
+ "script": "/consul/scripts/vid-mariadb-script.sh",
"interval": "10s",
"timeout": "1s"
}
"interval": "10s",
"timeout": "1s"
}
diff --git a/kubernetes/consul/templates/consul-agent-configmap.yaml
b/kubernetes/consul/templates/consul-agent-configmap.yaml
new file mode 100644
(file)
index 0000000..
0f37f50
--- /dev/null
+++ b/
kubernetes/consul/templates/consul-agent-configmap.yaml
@@ -0,0
+1,25
@@
+#{{ if not .Values.disableConsulConsulAgent }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: consul-agent-configmap
+ namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/config/consul-agent-config/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+ name: consul-agent-scripts-configmap
+ namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/config/consul-agent-config/scripts/*").AsConfig . | indent 2 }}
+---
+apiVersion: v1
+kind: Secret
+metadata:
+ name: consul-agent-certs-secret
+ namespace: {{ .Values.nsPrefix }}
+data:
+{{ tpl (.Files.Glob "resources/config/consul-agent-config/certs/*").AsSecrets . | indent 2 }}
+#{{ end }}
diff --git
a/kubernetes/consul/templates/consul-agent-deployment.yaml
b/kubernetes/consul/templates/consul-agent-deployment.yaml
index
a2bbe66
..
8d780f0
100644
(file)
--- a/
kubernetes/consul/templates/consul-agent-deployment.yaml
+++ b/
kubernetes/consul/templates/consul-agent-deployment.yaml
@@
-18,15
+18,26
@@
spec:
name: consul-agent
spec:
containers:
name: consul-agent
spec:
containers:
- - image: "{{ .Values.consul
imageRegistry }}:{{ .Values.consuldockerTag
}}"
+ - image: "{{ .Values.consul
agentRegistry
}}"
command: ["/usr/local/bin/docker-entrypoint.sh"]
args: ["agent","-client","0.0.0.0","-enable-script-checks","-join","consul-server.{{ .Values.nsPrefix }}"]
name: consul-server
volumeMounts:
- mountPath: /consul/config
name: consul-agent-config
command: ["/usr/local/bin/docker-entrypoint.sh"]
args: ["agent","-client","0.0.0.0","-enable-script-checks","-join","consul-server.{{ .Values.nsPrefix }}"]
name: consul-server
volumeMounts:
- mountPath: /consul/config
name: consul-agent-config
+ - mountPath: /consul/scripts
+ name: consul-agent-scripts-config
+ - mountPath: /consul/certs
+ name: consul-agent-certs-config
volumes:
volumes:
- -
hostPath
:
- path: {{ .Values.rootHostPath }}/{{ .Values.nsPrefix }}/consul/consul-agent-config
+ -
configMap
:
+ name: consul-agent-configmap
name: consul-agent-config
name: consul-agent-config
+ - configMap:
+ name: consul-agent-scripts-configmap
+ defaultMode: 0755
+ name: consul-agent-scripts-config
+ - secret:
+ secretName: consul-agent-certs-secret
+ name: consul-agent-certs-config
#{{ end }}
#{{ end }}
diff --git
a/kubernetes/consul/templates/consul-server-deployment.yaml
b/kubernetes/consul/templates/consul-server-deployment.yaml
index
6aafee4
..
706aa0e
100644
(file)
--- a/
kubernetes/consul/templates/consul-server-deployment.yaml
+++ b/
kubernetes/consul/templates/consul-server-deployment.yaml
@@
-18,15
+18,8
@@
spec:
name: consul-server
spec:
containers:
name: consul-server
spec:
containers:
- - image: "{{ .Values.consul
imageRegistry }}:{{ .Values.consuldockerTag
}}"
+ - image: "{{ .Values.consul
serverRegistry
}}"
command: ["/usr/local/bin/docker-entrypoint.sh"]
args: ["agent","-server","-client","0.0.0.0","-enable-script-checks","-bootstrap-expect=3","-ui","-join","consul-server.{{ .Values.nsPrefix }}"]
name: consul-server
command: ["/usr/local/bin/docker-entrypoint.sh"]
args: ["agent","-server","-client","0.0.0.0","-enable-script-checks","-bootstrap-expect=3","-ui","-join","consul-server.{{ .Values.nsPrefix }}"]
name: consul-server
- volumeMounts:
- - mountPath: /consul/config
- name: consul-server-config
- volumes:
- - hostPath:
- path: {{ .Values.rootHostPath }}/{{ .Values.nsPrefix }}/consul/consul-server-config
- name: consul-server-config
#{{ end }}
#{{ end }}
diff --git
a/kubernetes/consul/values.yaml
b/kubernetes/consul/values.yaml
index
a6909d7
..
3886727
100644
(file)
--- a/
kubernetes/consul/values.yaml
+++ b/
kubernetes/consul/values.yaml
@@
-1,8
+1,7
@@
nsPrefix: "onap"
nodePortPrefix: 302
nsPrefix: "onap"
nodePortPrefix: 302
-consuldockerTag: "latest"
-rootHostPath: "/dockerdata-nfs"
-consulimageRegistry: "docker.io/consul"
+consulserverRegistry: "docker.io/consul:1.0.6"
+consulagentRegistry: "oomk8s/consul:1.0.0"
consulAgentReplicas: 1
consulServerReplicas: 3
service:
consulAgentReplicas: 1
consulServerReplicas: 3
service: