Remove nsPrefix references from consul chart

Issue-ID: OOM-1025

Change-Id: Icc05ec5db4580d5264831fd30ff5ec699f945c5f
Signed-off-by: Priyanka Jain <Priyanka.Jain3@amdocs.com>

1 files changed, 32 insertions, 32 deletions

diff --git a/kubernetes/consul/resources/config/consul-agent-config/vfc-health.json b/kubernetes/consul/resources/config/consul-agent-config/vfc-health.json
index 25e670c7da..3661ac708b 100644
--- a/kubernetes/consul/resources/config/consul-agent-config/vfc-health.json
+++ b/kubernetes/consul/resources/config/consul-agent-config/vfc-health.json
@@ -3,114 +3,114 @@
     "name": "Health Check: VFC",
     "checks": [
       {
-        "id": "vfc-catalog.{{ .Values.nsPrefix }}",
+        "id": "vfc-catalog",
         "name": "VFC catalog Health Check",
-        "tcp": "vfc-catalog.{{ .Values.nsPrefix }}:8806",
+        "tcp": "vfc-catalog:8806",
         "interval": "15s",
         "timeout": "1s"
       },
       {
-        "id": "vfc-emsdriver.{{ .Values.nsPrefix }}",
+        "id": "vfc-emsdriver",
         "name": "VFC emsdriver Health Check",
-        "tcp": "vfc-emsdriver.{{ .Values.nsPrefix }}:8206",
+        "tcp": "vfc-ems-driver:8206",
         "interval": "15s",
         "timeout": "1s"
       },
       {
-        "id": "vfc-gvnfmdriver.{{ .Values.nsPrefix }}",
+        "id": "vfc-gvnfmdriver",
         "name": "VFC gvnfmdriver Health Check",
-        "tcp": "vfc-gvnfmdriver.{{ .Values.nsPrefix }}:8484",
+        "tcp": "vfc-generic-vnfm-driver:8484",
         "interval": "15s",
         "timeout": "1s"
       },
       {
-        "id": "vfc-hwvnfmdriver.{{ .Values.nsPrefix }}",
+        "id": "vfc-hwvnfmdriver",
         "name": "VFC hwvnfmdriver Health Check",
-        "tcp": "vfc-hwvnfmdriver.{{ .Values.nsPrefix }}:8482",
+        "tcp": "vfc-huawei-vnfm-driver:8482",
         "interval": "15s",
         "timeout": "1s"
       },
       {
-        "id": "vfc-jujudriver.{{ .Values.nsPrefix }}",
+        "id": "vfc-jujudriver",
         "name": "VFC jujudriver Health Check",
-        "tcp": "vfc-jujudriver.{{ .Values.nsPrefix }}:8483",
+        "tcp": "vfc-juju-vnfm-driver:8483",
         "interval": "15s",
         "timeout": "1s"
       },
       {
-        "id": "vfc-nokiavnfmdriver.{{ .Values.nsPrefix }}",
+        "id": "vfc-nokiavnfmdriver",
         "name": "VFC nokiavnfmdriver Health Check",
-        "tcp": "vfc-nokiavnfmdriver.{{ .Values.nsPrefix }}:8486",
+        "tcp": "vfc-nokia-vnfm-driver:8486",
         "interval": "15s",
         "timeout": "1s"
       },
       {
-        "id": "vfc-nokiav2vnfmdriver.{{ .Values.nsPrefix }}",
+        "id": "vfc-nokiav2vnfmdriver",
         "name": "VFC nokiav2vnfmdriver Health Check",
-        "tcp": "vfc-nokiav2vnfmdriver.{{ .Values.nsPrefix }}:8089",
+        "tcp": "vfc-nokia-v2vnfm-driver:8089",
         "interval": "15s",
         "timeout": "1s"
       },
       {
-        "id": "vfc-nslcm.{{ .Values.nsPrefix }}",
+        "id": "vfc-nslcm",
         "name": "VFC nslcm Health Check",
-        "tcp": "vfc-nslcm.{{ .Values.nsPrefix }}:8403",
+        "tcp": "vfc-nslcm:8403",
         "interval": "15s",
         "timeout": "1s"
       },
       {
-        "id": "vfc-resmgr.{{ .Values.nsPrefix }}",
+        "id": "vfc-resmgr",
         "name": "VFC resmgr Health Check",
-        "tcp": "vfc-resmgr.{{ .Values.nsPrefix }}:8480",
+        "tcp": "vfc-resmgr:8480",
         "interval": "15s",
         "timeout": "1s"
       },
       {
-        "id": "vfc-vnflcm.{{ .Values.nsPrefix }}",
+        "id": "vfc-vnflcm",
         "name": "VFC vnflcm Health Check",
-        "tcp": "vfc-vnflcm.{{ .Values.nsPrefix }}:8801",
+        "tcp": "vfc-vnflcm:8801",
         "interval": "15s",
         "timeout": "1s"
       },
       {
-        "id": "vfc-vnfmgr.{{ .Values.nsPrefix }}",
+        "id": "vfc-vnfmgr",
         "name": "VFC vnfmgr Health Check",
-        "tcp": "vfc-vnfmgr.{{ .Values.nsPrefix }}:8803",
+        "tcp": "vfc-vnfmgr:8803",
         "interval": "15s",
         "timeout": "1s"
       },
       {
-        "id": "vfc-vnfres.{{ .Values.nsPrefix }}",
+        "id": "vfc-vnfres",
         "name": "VFC vnfres Health Check",
-        "tcp": "vfc-vnfres.{{ .Values.nsPrefix }}:8802",
+        "tcp": "vfc-vnfres:8802",
         "interval": "15s",
         "timeout": "1s"
       },
       {
-        "id": "vfc-workflow.{{ .Values.nsPrefix }}",
+        "id": "vfc-workflow",
         "name": "VFC workflow Health Check",
-        "tcp": "vfc-workflow.{{ .Values.nsPrefix }}:10550",
+        "tcp": "vfc-workflow:10550",
         "interval": "15s",
         "timeout": "1s"
       },
       {
-        "id": "vfc-workflowengineactiviti.{{ .Values.nsPrefix }}",
+        "id": "vfc-workflowengineactiviti",
         "name": "VFC workflow-engine Health Check",
-        "tcp": "vfc-workflowengineactiviti.{{ .Values.nsPrefix }}:8080",
+        "tcp": "vfc-workflow-engine:8080",
         "interval": "15s",
         "timeout": "1s"
       },
       {
-        "id": "vfc-ztesdncdriver.{{ .Values.nsPrefix }}",
+        "id": "vfc-ztesdncdriver",
         "name": "VFC ztesdncdriver Health Check",
-        "tcp": "vfc-ztesdncdriver.{{ .Values.nsPrefix }}:8411",
+        "tcp": "vfc-zte-sdnc-driver:8411",
         "interval": "15s",
         "timeout": "1s"
       },
       {
-        "id": "vfc-ztevnfmdriver.{{ .Values.nsPrefix }}",
+        "id": "vfc-ztevnfmdriver",
         "name": "VFC ztevnfmdriver Health Check",
-        "tcp": "vfc-ztevnfmdriver.{{ .Values.nsPrefix }}:8410",
+        "tcp": "vfc-zte-vnfm-driver:8410",
         "interval": "15s",
         "timeout": "1s"
       }