summaryrefslogtreecommitdiffstats
path: root/catalog-be/sdc-backend
diff options
context:
space:
mode:
authorml636r <ml6364@att.com>2018-04-17 12:48:56 +0300
committerIdan Amit <ia096e@intl.att.com>2018-04-17 11:32:46 +0000
commit757ca27473fd4d713db46fd281ce3f14cb7949d6 (patch)
treee1d80c06c5ac8c0cb87f160cce2f2c8463499751 /catalog-be/sdc-backend
parentbfbe2c38fd1a5e85c2b30a4217015492d586caa2 (diff)
fix miss match in the notification
align the object sent from sdc for distribution with the one in distribution client revert resourceType to resoucreType exclude DMAPP DE and DCAE from failing the health check align the ready probe to check for 200 insted of 500 in FE and BE Change-Id: I1e03660b1e6aded4b6c0cb19fcffe9a821679316 Issue-ID: SDC-1238 Signed-off-by: ml636r <ml6364@att.com>
Diffstat (limited to 'catalog-be/sdc-backend')
-rw-r--r--catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb7
-rw-r--r--catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb2
2 files changed, 7 insertions, 2 deletions
diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
index 6ed6406191..a35896afe6 100644
--- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
+++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-configuration.yaml.erb
@@ -711,4 +711,9 @@ excludedGroupTypesMapping:
Service:
- org.openecomp.groups.VfModule
- org.openecomp.groups.heat.HeatStack
- - tosca.groups.Root \ No newline at end of file
+ - tosca.groups.Root
+
+healthStatusExclude:
+ - DE
+ - DMAPP
+ - DCAE \ No newline at end of file
diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb
index 4d8540e956..84d1c6f08f 100644
--- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb
+++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/ready-probe.sh.erb
@@ -1,7 +1,7 @@
#!/bin/bash
health_Check_http_code=$(curl --max-time 5 -o /dev/null -w '%{http_code}' http://127.0.0.1:8080/sdc2/rest/healthCheck)
-if [[ "$health_Check_http_code" -eq 500 ]]; then
+if [[ "$health_Check_http_code" -eq 200 ]]; then
exit 200
else
exit $health_Check_http_code