67 files changed, 0 insertions, 2561 deletions
diff --git a/kubernetes/consul/.helmignore b/kubernetes/consul/.helmignore
deleted file mode 100644
index 7ddbad7ef4..0000000000
--- a/kubernetes/consul/.helmignore
+++ /dev/null
@@ -1,22 +0,0 @@
-# Patterns to ignore when building packages.
-# This supports shell glob matching, relative path matching, and
-# negation (prefixed with !). Only one pattern per line.
-.DS_Store
-# Common VCS dirs
-.git/
-.gitignore
-.bzr/
-.bzrignore
-.hg/
-.hgignore
-.svn/
-# Common backup files
-*.swp
-*.bak
-*.tmp
-*~
-# Various IDEs
-.project
-.idea/
-*.tmproj
-components/
diff --git a/kubernetes/consul/Chart.yaml b/kubernetes/consul/Chart.yaml
deleted file mode 100644
index 0000463560..0000000000
--- a/kubernetes/consul/Chart.yaml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-# Modifications Copyright © 2021 Nordix Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v2
-description: ONAP Consul Agent
-name: consul
-version: 12.0.0
-
-dependencies:
-  - name: common
-    version: ~12.x-0
-    # local reference to common chart, as it is
-    # a part of this chart's package and will not
-    # be published independently to a repo (at this point)
-    repository: '@local'
-  - name: repositoryGenerator
-    version: ~12.x-0
-    repository: '@local'
-  - name: consul-server
-    version: ~12.x-0
-    repository: 'file://components/consul-server'
-    condition: consul-server.enabled
-  - name: serviceAccount
-    version: ~12.x-0
-    repository: '@local'
-\ No newline at end of file
diff --git a/kubernetes/consul/Makefile b/kubernetes/consul/Makefile
deleted file mode 100644
index c483a02eab..0000000000
--- a/kubernetes/consul/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright © 2020 Samsung Electronics, Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-OUTPUT_DIR := $(ROOT_DIR)/../dist
-PACKAGE_DIR := $(OUTPUT_DIR)/packages
-SECRET_DIR := $(OUTPUT_DIR)/secrets
-
-EXCLUDES := dist resources templates charts docker
-HELM_BIN := helm
-ifneq ($(SKIP_LINT),TRUE)
-	HELM_LINT_CMD := $(HELM_BIN) lint
-else
-	HELM_LINT_CMD := echo "Skipping linting of"
-endif
-
-HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
-
-.PHONY: $(EXCLUDES) $(HELM_CHARTS)
-
-all: $(HELM_CHARTS)
-
-$(HELM_CHARTS):
-	@echo "\n[$@]"
-	@make package-$@
-
-make-%:
-	@if [ -f $*/Makefile ]; then make -C $*; fi
-
-dep-%: make-%
-	@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
-
-lint-%: dep-%
-	@if [ -f $*/Chart.yaml ]; then $(HELM_LINT_CMD) $*; fi
-
-package-%: lint-%
-	@mkdir -p $(PACKAGE_DIR)
-	@if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi
-	@sleep 3
-	#@$(HELM_BIN) repo index $(PACKAGE_DIR)
-
-clean:
-	@rm -f */Chart.lock
-	@rm -f *tgz */charts/*tgz
-	@rm -rf $(PACKAGE_DIR)
-%:
-	@:
diff --git a/kubernetes/consul/components/Makefile b/kubernetes/consul/components/Makefile
deleted file mode 100644
index fa3c4b9af9..0000000000
--- a/kubernetes/consul/components/Makefile
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright © 2020 Samsung Electronics, Orange
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-ROOT_DIR := $(shell dirname $(realpath $(lastword $(MAKEFILE_LIST))))
-OUTPUT_DIR := $(ROOT_DIR)/../../dist
-PACKAGE_DIR := $(OUTPUT_DIR)/packages
-SECRET_DIR := $(OUTPUT_DIR)/secrets
-
-EXCLUDES :=
-HELM_BIN := helm
-ifneq ($(SKIP_LINT),TRUE)
-	HELM_LINT_CMD := $(HELM_BIN) lint
-else
-	HELM_LINT_CMD := echo "Skipping linting of"
-endif
-
-HELM_CHARTS := $(filter-out $(EXCLUDES), $(sort $(patsubst %/.,%,$(wildcard */.))))
-
-.PHONY: $(EXCLUDES) $(HELM_CHARTS)
-
-all: $(HELM_CHARTS)
-
-$(HELM_CHARTS):
-	@echo "\n[$@]"
-	@make package-$@
-
-make-%:
-	@if [ -f $*/Makefile ]; then make -C $*; fi
-
-dep-%: make-%
-	@if [ -f $*/Chart.yaml ]; then $(HELM_BIN) dep up $*; fi
-
-lint-%: dep-%
-	@if [ -f $*/Chart.yaml ]; then $(HELM_LINT_CMD) $*; fi
-
-package-%: lint-%
-	@mkdir -p $(PACKAGE_DIR)
-	@if [ -f $*/Chart.yaml ]; then PACKAGE_NAME=$$($(HELM_BIN) package -d $(PACKAGE_DIR) $* | cut -d":" -f2) && $(HELM_BIN) cm-push -f $$PACKAGE_NAME local; fi
-	@sleep 3
-	#@$(HELM_BIN) repo index $(PACKAGE_DIR)
-
-clean:
-	@rm -f */Chart.lock
-	@rm -f *tgz */charts/*tgz
-	@rm -rf $(PACKAGE_DIR)
-%:
-	@:
diff --git a/kubernetes/consul/components/consul-server/Chart.yaml b/kubernetes/consul/components/consul-server/Chart.yaml
deleted file mode 100644
index 8eb28ce1d4..0000000000
--- a/kubernetes/consul/components/consul-server/Chart.yaml
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-# Modifications Copyright © 2021 Orange
-# Modifications Copyright © 2021 Nordix Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-apiVersion: v2
-description: ONAP Consul Server
-name: consul-server
-version: 12.0.0
-
-dependencies:
-  - name: common
-    version: ~12.x-0
-    # local reference to common chart, as it is
-    # a part of this chart's package and will not
-    # be published independently to a repo (at this point)
-    repository: '@local'
-  - name: serviceAccount
-    version: ~12.x-0
-    repository: '@local'
-  - name: repositoryGenerator
-    version: ~12.x-0
-    repository: '@local'
-\ No newline at end of file
diff --git a/kubernetes/consul/components/consul-server/templates/NOTES.txt b/kubernetes/consul/components/consul-server/templates/NOTES.txt
deleted file mode 100644
index 157fe92427..0000000000
--- a/kubernetes/consul/components/consul-server/templates/NOTES.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-{{/*
-# Copyright © 2018 Amdocs, AT&T, Bell Canada
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range .Values.ingress.hosts }}
-  http://{{ . }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
-  export NODE_PORT=$(kubectl get --namespace {{ include "common.namespace" . }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "common.name" . }})
-  export NODE_IP=$(kubectl get nodes --namespace {{ include "common.namespace" . }} -o jsonpath="{.items[0].status.addresses[0].address}")
-  echo http://$NODE_IP:$NODE_PORT
-{{- else if contains "LoadBalancer" .Values.service.type }}
-     NOTE: It may take a few minutes for the LoadBalancer IP to be available.
-           You can watch the status of by running 'kubectl get svc -w {{ include "common.name" . }}'
-  export SERVICE_IP=$(kubectl get svc --namespace {{ include "common.namespace" . }} {{ include "common.name" . }} -o jsonpath='{.status.loadBalancer.ingress[0].ip}')
-  echo http://$SERVICE_IP:{{ .Values.service.externalPort }}
-{{- else if contains "ClusterIP" .Values.service.type }}
-  export POD_NAME=$(kubectl get pods --namespace {{ include "common.namespace" . }} -l "app={{ include "common.name" . }},release={{ .Release.Name }}" -o jsonpath="{.items[0].metadata.name}")
-  echo "Visit http://127.0.0.1:8080 to use your application"
-  kubectl port-forward $POD_NAME 8080:{{ .Values.service.internalPort }}
-{{- end }}
diff --git a/kubernetes/consul/components/consul-server/templates/service.yaml b/kubernetes/consul/components/consul-server/templates/service.yaml
deleted file mode 100644
index c24ddfb7e4..0000000000
--- a/kubernetes/consul/components/consul-server/templates/service.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-{{/*
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: {{ .Values.service.type }}
-  ports:
-  {{if eq .Values.service.type "NodePort" -}}
-  - port: {{ .Values.service.internalPort }}
-    nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort }}
-    name: {{ .Values.service.portName }}
-  {{- else -}}
-  - port: {{ .Values.service.internalPort }}
-    name: {{ .Values.service.portName }}
-  {{- end}}
-  selector:
-    app: {{ include "common.name" . }}
-    release: {{ include "common.release" . }}
-  clusterIP: None
----
-apiVersion: v1
-kind: Service
-metadata:
-  name: {{ include "common.servicename" . }}-ui
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
-spec:
-  type: {{ .Values.service.type2 }}
-  ports:
-  {{if eq .Values.service.type2 "NodePort" -}}
-  - port: {{ .Values.service.internalPort2 }}
-    nodePort: {{ .Values.global.nodePortPrefix | default .Values.nodePortPrefix }}{{ .Values.service.nodePort2 }}
-    name: {{ .Values.service.portName2 }}
-  {{- else -}}
-  - port: {{ .Values.service.internalPort2 }}
-    name: {{ .Values.service.portName2 }}
-  {{- end}}
-  selector:
-    app: {{ include "common.name" . }}
-    release: {{ include "common.release" . }}
diff --git a/kubernetes/consul/components/consul-server/templates/statefulset.yaml b/kubernetes/consul/components/consul-server/templates/statefulset.yaml
deleted file mode 100644
index 8e872b9c87..0000000000
--- a/kubernetes/consul/components/consul-server/templates/statefulset.yaml
+++ /dev/null
@@ -1,77 +0,0 @@
-{{/*
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-apiVersion: apps/v1
-kind: StatefulSet
-metadata:
-  name: {{ include "common.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
-spec:
-  serviceName: {{ include "common.servicename" . }}
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.name" . }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.name" . }}
-        release: {{ include "common.release" . }}
-    spec:
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
-      containers:
-      - name: {{ include "common.name" . }}
-        image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
-        securityContext:
-          runAsUser: {{ .Values.securityContext.runAsUser }}
-          runAsGroup: {{ .Values.securityContext.runAsGroup }}
-        command: ["/usr/local/bin/docker-entrypoint.sh"]
-        args:
-        - "agent"
-        - "-bootstrap-expect={{ .Values.replicaCount }}"
-        - "-enable-script-checks"
-{{- $fullname := include "common.fullname" . -}}
-{{- $servname := include "common.servicename" . -}}
-{{- range $i,$t := until (int .Values.replicaCount)}}
-        - "-retry-join={{ $fullname }}-{{$i}}.{{ $servname }}"
-{{- end }}
-        - "-client=0.0.0.0"
-        - "-server"
-        - "-ui"
-        ports:
-        - containerPort: {{ .Values.service.internalPort }}
-        - containerPort: {{ .Values.service.internalPort2 }}
-        {{- if eq .Values.liveness.enabled true }}
-        livenessProbe:
-          tcpSocket:
-            port: {{ .Values.service.internalPort }}
-          initialDelaySeconds: {{ .Values.liveness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.liveness.periodSeconds }}
-        {{ end -}}
-        readinessProbe:
-          tcpSocket:
-            port: {{ .Values.service.internalPort }}
-          initialDelaySeconds: {{ .Values.readiness.initialDelaySeconds }}
-          periodSeconds: {{ .Values.readiness.periodSeconds }}
-        resources: {{ include "common.resources" . | nindent 10 }}
-      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
diff --git a/kubernetes/consul/components/consul-server/values.yaml b/kubernetes/consul/components/consul-server/values.yaml
deleted file mode 100644
index d4e649444a..0000000000
--- a/kubernetes/consul/components/consul-server/values.yaml
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#################################################################
-# Global configuration defaults.
-#################################################################
-global:
-  nodePortPrefix: 302
-  repository: nexus3.onap.org:10001
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-# application image
-image: onap/oom/consul:2.1.0
-pullPolicy: Always
-
-# flag to enable debugging - application support required
-debugEnabled: false
-
-replicaCount: 3
-
-nodeSelector: {}
-
-affinity: {}
-
-# probe configuration parameters
-liveness:
-  initialDelaySeconds: 10
-  periodSeconds: 5
-  # necessary to disable liveness probe when setting breakpoints
-  # in debugger so K8s doesn't restart unresponsive container
-  enabled: true
-
-readiness:
-  initialDelaySeconds: 10
-  periodSeconds: 5
-
-service:
-  type: ClusterIP
-  name: consul-server
-  portName: consul-join
-  internalPort: 8301
-  type2: ClusterIP
-  portName2: consul-ui
-  internalPort2: 8500
-  nodePort2: 70
-
-ingress:
-  enabled: false
-
-#resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  #
-  # Example:
-  # Configure resource requests and limits
-  # ref: http://kubernetes.io/docs/user-guide/compute-resources/
-  # Minimum memory for development is 2 CPU cores and 4GB memory
-  # Minimum memory for production is 4 CPU cores and 8GB memory
-resources:
-  small:
-    limits:
-      cpu: 100m
-      memory: 100Mi
-    requests:
-      cpu: 30m
-      memory: 25Mi
-  large:
-    limits:
-      cpu: 2
-      memory: 4Gi
-    requests:
-      cpu: 1
-      memory: 2Gi
-  unlimited: {}
-
-securityContext:
-  fsGroup: 1000
-  runAsUser: 100
-  runAsGroup: 1000
-
-#Pods Service Account
-serviceAccount:
-  nameOverride: consul-server
-  roles:
-    - read
diff --git a/kubernetes/consul/resources/config/consul-agent-config/aaf-service-health.json b/kubernetes/consul/resources/config/consul-agent-config/aaf-service-health.json
deleted file mode 100755
index cd715f8b6a..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/aaf-service-health.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: Application Authorization Framework",
-    "checks": [
-      {
-        "id": "aaf-service",
-        "name": "AAF Service Health Check",
-        "http": "https://aaf-service:8100/authz/perms/user/demo@people.osaaf.org",
-        "header": {
-          "Authorization": ["Basic ZGVtb0BwZW9wbGUub3NhYWYub3JnOmRlbW8xMjM0NTYh"],
-          "X-TransactionId": ["ConsulHealthCheck"],
-          "X-FromAppId": ["healthcheck"]
-        },
-        "tls_skip_verify": true,
-        "interval": "20s",
-        "timeout": "5s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/aaf-sms-health.json b/kubernetes/consul/resources/config/consul-agent-config/aaf-sms-health.json
deleted file mode 100644
index 965732da5d..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/aaf-sms-health.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: Secret Management Service (sms)",
-    "check":[
-      {
-        "id"  : "aaf-sms-health",
-        "name": "SMS Health Check",
-        "http": "https://aaf-sms.{{ .Release.Namespace }}:10443/v1/sms/healthcheck",
-        "tls_skip_verify": true,
-        "method": "GET",
-        "interval": "20s",
-        "timeout": "5s"
-      }
-    ]
-  }
-}
-
diff --git a/kubernetes/consul/resources/config/consul-agent-config/aai-data-router-health.json b/kubernetes/consul/resources/config/consul-agent-config/aai-data-router-health.json
deleted file mode 100644
index be41934e77..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/aai-data-router-health.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "service": {
-    "name": "A&AI Synapse Data Routing Service",
-    "checks": [
-      {
-        "id": "data-router-process",
-        "name": "Synapse Presence",
-        "script": "/consul/scripts/data-router-script.sh",
-        "interval": "15s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/aai-model-loader-health.json b/kubernetes/consul/resources/config/consul-agent-config/aai-model-loader-health.json
deleted file mode 100644
index 044a844e35..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/aai-model-loader-health.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "service": {
-    "name": "A&AI Model Loader",
-    "checks": [
-      {
-        "id": "model-loader-process",
-        "name": "Model Loader Presence",
-        "script": "/consul/scripts/model-loader-script.sh",
-        "interval": "15s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/aai-search-data-service-health.json b/kubernetes/consul/resources/config/consul-agent-config/aai-search-data-service-health.json
deleted file mode 100644
index 0817a19cf0..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/aai-search-data-service-health.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "service": {
-    "name": "A&AI Search Data Service",
-    "checks": [
-      {
-        "id": "elasticsearch",
-        "name": "Search Data Service Document Store",
-        "http": "http://aai-elasticsearch:9200/_cat/indices?v",
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "elasticsearch-write-health",
-        "name": "Search Data Service Document Store Write Test",
-        "script": "/consul/scripts/aai-search-storage-write-script.sh",
-        "interval": "60s"
-      },
-      {
-        "id": "search-data-service-availability",
-        "name": "Search Data Service Availability",
-        "script": "curl -k  --cert /consul/certs/client-cert-onap.crt.pem --cert-type PEM --key /consul/certs/client-cert-onap.key.pem --key-type PEM https://search-data-service: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",
-        "script": "/consul/scripts/search-data-service-availability.sh",
-        "interval": "15s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/aai-services-health.json b/kubernetes/consul/resources/config/consul-agent-config/aai-services-health.json
deleted file mode 100644
index 99acff4e61..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/aai-services-health.json
+++ /dev/null
@@ -1,46 +0,0 @@
-{
-  "service": {
-    "name": "Active and Available Inventory",
-    "checks": [
-      {
-        "id": "aai-service",
-        "name": "Core A&AI",
-        "http": "https://aai.{{ .Release.Namespace }}:8443/aai/util/echo",
-        "header": {
-          "Authorization": ["Basic QUFJOkFBSQ=="],
-          "X-TransactionId": ["ConsulHealthCheck"],
-          "X-FromAppId": ["healthcheck"]
-        },
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "aai-resources",
-        "name": "Resources Microservice",
-        "http": "https://aai-resources.{{ .Release.Namespace }}:8447/aai/util/echo",
-        "header": {
-          "Authorization": ["Basic QUFJOkFBSQ=="],
-          "X-TransactionId": ["ConsulHealthCheck"],
-          "X-FromAppId": ["healthcheck"]
-        },
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "aai-traversal",
-        "name": "Traversal Microservice",
-        "http": "https://aai-traversal.{{ .Release.Namespace }}:8446/aai/util/echo",
-        "header": {
-          "Authorization": ["Basic QUFJOkFBSQ=="],
-          "X-TransactionId": ["ConsulHealthCheck"],
-          "X-FromAppId": ["healthcheck"]
-        },
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/aai-sparky-be-health.json b/kubernetes/consul/resources/config/consul-agent-config/aai-sparky-be-health.json
deleted file mode 100644
index bf6305c1d0..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/aai-sparky-be-health.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "service": {
-    "name": "A&AI UI Backend Service",
-    "checks": [
-      {
-        "id": "sparky-be-process",
-        "name": "UI Backend Presence",
-        "script": "/consul/scripts/sparky-be-script.sh",
-        "interval": "15s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.crt.pem b/kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.crt.pem
deleted file mode 100644
index b842710c11..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.crt.pem
+++ /dev/null
@@ -1,25 +0,0 @@
-Bag Attributes
-    friendlyName: tomcat
-    localKeyID: 54 69 6D 65 20 31 34 39 33 33 32 33 39 32 32 37 35 31
-subject=/C=CA/ST=Ontario/L=Ottawa/O=ONAP/OU=ONAP/CN=ONAP
-issuer=/C=CA/ST=Ontario/L=Ottawa/O=ONAP/OU=ONAP/CN=ONAP
------BEGIN CERTIFICATE-----
-MIIDWTCCAkGgAwIBAgIERWHcIzANBgkqhkiG9w0BAQsFADBdMQswCQYDVQQGEwJD
-QTEQMA4GA1UECBMHT250YXJpbzEPMA0GA1UEBxMGT3R0YXdhMQ0wCwYDVQQKEwRP
-TkFQMQ0wCwYDVQQLEwRPTkFQMQ0wCwYDVQQDEwRPTkFQMB4XDTE3MDQyNzIwMDUz
-N1oXDTM3MDExMjIwMDUzN1owXTELMAkGA1UEBhMCQ0ExEDAOBgNVBAgTB09udGFy
-aW8xDzANBgNVBAcTBk90dGF3YTENMAsGA1UEChMET05BUDENMAsGA1UECxMET05B
-UDENMAsGA1UEAxMET05BUDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEB
-AJsQpjB5U0exZHWKVt6xDzmBBhLiAtv7Qb8zsbAcIZPxuKsieOJykWDCaf+Ip7oe
-+b86nf4LmKrNm4KMsDNnlU7Bg7+3HFa7m+tZgfILORv2HPMRXgvcqPFr1dxgTBkp
-xtlcGXHhA8oBpmqTmOCitE+ngVH+FBVxN93aHEDz+Dgc06PyzoP/xWI0GjvlOsv/
-qZeXCj6K4Hpu/FSPNk06Piq9M+rDwUMuyaRtY9FWjYMvkMCrRvlZUoAasrC0BGyR
-UAboHdk5aW3AZ0cVR6NMSlELcvCUFqzacAOWLgffX3b5vhkOaAsmnnzmxANV6s0t
-SqrD6Mmjg5OcYJW4VFKrwjUCAwEAAaMhMB8wHQYDVR0OBBYEFNji+IU70Qgptn4i
-boq/rOKNAg8tMA0GCSqGSIb3DQEBCwUAA4IBAQBc5mJLeeUUzJ4MujZjn0DS3Lvv
-THJTE54Id1euT3ddzfX3htF0Ewd90YzmLuj1y8r8PXj7b/8Bq+cvoKbmJ42c8h3X
-If0tqde+gYWx1X3NAWHwz00Cje9R0KY4Bx1Cvr39jTw/ESnuSQDKPHBnn8WyAS9K
-08ZhvrVSK54d3U7tDVut9UVva8Scdi12utTAWaOIlusLo3bU9Z6t+tgg7AnQBYc0
-N9oCMbq/MACFlLSdc1J6NITYS8XHY2RS8u88eLbWkCcEEx1glYz/PMX3+V1Ow9Uy
-MjenEx8ifl96ZSOe9XsI2gl2TCaevCY/QuREu4LZB9XmO0gncH7gF5w9Bw2b
------END CERTIFICATE-----
diff --git a/kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.key.pem b/kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.key.pem
deleted file mode 100644
index 95de561981..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/certs/client-cert-onap.key.pem
+++ /dev/null
@@ -1,32 +0,0 @@
-Bag Attributes
-    friendlyName: tomcat
-    localKeyID: 54 69 6D 65 20 31 34 39 33 33 32 33 39 32 32 37 35 31
-Key Attributes: <No Attributes>
------BEGIN PRIVATE KEY-----
-MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCbEKYweVNHsWR1
-ilbesQ85gQYS4gLb+0G/M7GwHCGT8birInjicpFgwmn/iKe6Hvm/Op3+C5iqzZuC
-jLAzZ5VOwYO/txxWu5vrWYHyCzkb9hzzEV4L3Kjxa9XcYEwZKcbZXBlx4QPKAaZq
-k5jgorRPp4FR/hQVcTfd2hxA8/g4HNOj8s6D/8ViNBo75TrL/6mXlwo+iuB6bvxU
-jzZNOj4qvTPqw8FDLsmkbWPRVo2DL5DAq0b5WVKAGrKwtARskVAG6B3ZOWltwGdH
-FUejTEpRC3LwlBas2nADli4H3192+b4ZDmgLJp585sQDVerNLUqqw+jJo4OTnGCV
-uFRSq8I1AgMBAAECggEANFs6wcM1S0+qC8XZ7vb5nQDjfByzunLrkBN0O3JEJB/J
-qn7JMixcyb7a61zIxR8QVHEGR3DC62jgyQOXusOOtjjAs0qwVtihnKVsKr1/WuGO
-hMOobXjj0iAG5ZHeH+DrMxjVvo2rKdnExtdvFunY18xG7dhMD7Fam525THUTql4K
-yxhT7X6MrfS1eFjbR6oAIGNjoNTwyyEjEm4yvHO3PnG2NeyIeu7zIO2k+GimAAXT
-tN3AK30lmr3+35k6o+XQAhDE4/6msn6jBVSdLfK35ATFGwrojD0bCgALR4SUNEyd
-i33nuNLGyeI7DPWbqmjyWQW9uWLFJD85We2HzqBZQQKBgQDIrJ4PLvYE75dFWnSa
-lBr1HZbl/x5mP56MVEiwTabRbUsJoXKlX44lm9hwQaPbuoUAflb1ZtNKbyiRVsuN
-Ft5RToU9PWXyFtc2eyLCJToxHI4MhsuGRAaEeic5+l12wdpRxl74eeXdKJK4P/iU
-8wdhSxDG2ekkj6lyye5l5iwcBwKBgQDF0Pptcs+yPCz9FRqCmHT/I4QTK1VSD6mW
-F2Yd2KEUa4aocIb+L56ghJfYR+enIe9hHmb0ulomJaLLTicZJk6ffDfaQpCFBiS7
-BirDqHX8zlnBHePrBzZPyA5EfGMLxlP4uUk4g28JMFBJaZTEXAnQLUH0mIm0o0YR
-mbsaVo/Y4wKBgFsG8iuxAaf7hoLPJVV5GUFWyrxJnWCEO0csdEyE7MbS7NbRhU++
-qJwmtWc2Xz2svegbZxaqLe31vlEvLeYyGWaIV6gP0c6ezcDI2lt2x46/hS/pdSjS
-cqJlRqXmC79y77VoZmwP31USsnshiYEHPLHFeza4YilTgWmwb5OJdTjBAoGBAJBC
-0P7UhedjvyNqKoUnDdurWPxp07Ueuvw8YDpP61jq+a8JMUlaDQLe76XI+oWGV/6p
-n0fGR0weklRV0Gmk6B2jB1BizuZUDqFd4/4ActtE2WvekoKqJc+VA+KqG8lQf5iZ
-924BXA6Fb2e6WcXBoV5yQvFP9M0JbWYUiMCydAElAoGBAKof78r8POfTPq9fQA9I
-0zsQGnxqnSqyIu5yobM3GyXHBPOKdevlxyXxuMnGTr7upSNZrDrrA+f5Czlu7Fas
-qdt/5PmqYQjRsVoHNQFatUzHWwx2vU2Pr1jBpZFBpnjnLwn3A35+UEWn13nCjkla
-TrDniEcyId4ya5cMLDnM7Zgw
------END PRIVATE KEY-----
diff --git a/kubernetes/consul/resources/config/consul-agent-config/clamp-health.json b/kubernetes/consul/resources/config/consul-agent-config/clamp-health.json
deleted file mode 100644
index 5fb57b4b6b..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/clamp-health.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: CLAMP",
-    "check":[
-      {
-        "id"  : "clamp-health",
-        "name": "Clamp Health Check",
-        "http": "http://clamp:8080/restservices/clds/v1/clds/healthcheck",
-        "tls_skip_verify": true,
-        "method": "GET",
-        "interval": "10s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
-
diff --git a/kubernetes/consul/resources/config/consul-agent-config/clamp-mariadb-health.json b/kubernetes/consul/resources/config/consul-agent-config/clamp-mariadb-health.json
deleted file mode 100644
index f5ae467d74..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/clamp-mariadb-health.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: CLAMP - MariaDb",
-    "checks": [
-      {
-          "id": "clamp-mariadb",
-          "name": "CLAMP Mariadb Health Check",
-          "script": "/consul/scripts/clamp-mariadb-script.sh",
-          "interval": "10s",
-          "timeout": "1s"
-      }
-    ]
-
-  }
-}
-
diff --git a/kubernetes/consul/resources/config/consul-agent-config/cli-health-check.json b/kubernetes/consul/resources/config/consul-agent-config/cli-health-check.json
deleted file mode 100644
index 81e55cb871..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/cli-health-check.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: ONAP CLI",
-    "checks": [
-      {
-        "id": "cli",
-        "name": "CLI Health Check",
-        "http": "http://cli.{{include "common.namespace" .}}:8080",
-        "method": "GET",
-        "interval": "3600s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/log-elastic-search.json b/kubernetes/consul/resources/config/consul-agent-config/log-elastic-search.json
deleted file mode 100644
index 6e580579e1..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/log-elastic-search.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: Log - Elastic Search",
-    "checks": [
-      {
-        "id": "log-elasticsearch-server",
-        "name": "Log Elastic Search Health Check",
-        "http": "http://log-es:9200/_cluster/health?pretty",
-        "method": "GET",
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "log-elasticsearch-tcp",
-        "name": "Log Elastic Search TCP Health Check",
-        "tcp": "log-es-tcp:9300",
-        "interval": "15s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/log-kibana.json b/kubernetes/consul/resources/config/consul-agent-config/log-kibana.json
deleted file mode 100644
index 6bca63f7bf..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/log-kibana.json
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: Log - Kibana",
-    "checks": [
-      {
-        "id": "log-kibana-server",
-        "name": "Log kibana Health Check",
-        "http": "http://log-kibana:5601/status",
-        "method": "HEAD",
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/log-logstash.json b/kubernetes/consul/resources/config/consul-agent-config/log-logstash.json
deleted file mode 100644
index ea32ecfe2a..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/log-logstash.json
+++ /dev/null
@@ -1,95 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: Log - Log Stash",
-    "checks": [
-      {
-        "id": "log-logstash-internal-server-gi",
-        "name": "Log Stash Health Check - General Information",
-        "http": "http://log-ls-http:9600/?pretty",
-        "method": "GET",
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "log-logstash-internal-server-node-info",
-        "name": "Log Stash Health Check - Node Information",
-        "http": "http://log-ls-http:9600/_node/?pretty",
-        "method": "GET",
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "log-logstash-internal-server-os-info",
-        "name": "Log Stash Health Check - OS Information",
-        "http": "http://log-ls-http:9600/_node/os?pretty",
-        "method": "GET",
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "log-logstash-internal-server-jvm-info",
-        "name": "Log Stash Health Check - JVM Information",
-        "http": "http://log-ls-http:9600/_node/jvm?pretty",
-        "method": "GET",
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "log-logstash-internal-server-plugin-info",
-        "name": "Log Stash Health Check - Plugin Information",
-        "http": "http://log-ls-http:9600/_node/plugins?pretty",
-        "method": "GET",
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "log-logstash-internal-server-node-stat",
-        "name": "Log Stash Health Check - Node Stats",
-        "http": "http://log-ls-http:9600/_node/stats?pretty",
-        "method": "GET",
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "log-logstash-internal-server-jvm-stat",
-        "name": "Log Stash Health Check - JVM Stats",
-        "http": "http://log-ls-http:9600/_node/stats/jvm?pretty",
-        "method": "GET",
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "log-logstash-internal-server-process-stat",
-        "name": "Log Stash Health Check - Process Stats",
-        "http": "http://log-ls-http:9600/_node/stats/process?pretty",
-        "method": "GET",
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "log-logstash-internal-server-os-stat",
-        "name": "Log Stash Health Check - OS Stats",
-        "http": "http://log-ls-http:9600/_node/stats/os?pretty",
-        "method": "GET",
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "log-logstash-tcp",
-        "name": "Log Stash File Beat TCP Health Check",
-        "tcp": "log-ls:5044",
-        "interval": "15s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/model-loader.properties b/kubernetes/consul/resources/config/consul-agent-config/model-loader.properties
deleted file mode 100644
index aae18b1e98..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/model-loader.properties
+++ /dev/null
@@ -1,39 +0,0 @@
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-# Model Loader Distribution Client Configuration
-ml.distribution.ACTIVE_SERVER_TLS_AUTH=false
-ml.distribution.ASDC_ADDRESS=c2.vm1.sdc.simpledemo.openecomp.org:8443
-ml.distribution.CONSUMER_GROUP=aai-ml-group
-ml.distribution.CONSUMER_ID=aai-ml
-ml.distribution.ENVIRONMENT_NAME=AUTO
-ml.distribution.KEYSTORE_PASSWORD=
-ml.distribution.KEYSTORE_FILE=asdc-client.jks
-ml.distribution.PASSWORD=OBF:1ks51l8d1o3i1pcc1r2r1e211r391kls1pyj1z7u1njf1lx51go21hnj1y0k1mli1sop1k8o1j651vu91mxw1vun1mze1vv11j8x1k5i1sp11mjc1y161hlr1gm41m111nkj1z781pw31kku1r4p1e391r571pbm1o741l4x1ksp
-ml.distribution.POLLING_INTERVAL=30
-ml.distribution.POLLING_TIMEOUT=20
-ml.distribution.USER=aai
-ml.distribution.ARTIFACT_TYPES=MODEL_INVENTORY_PROFILE,MODEL_QUERY_SPEC,VNF_CATALOG
-
-# Model Loader AAI REST Client Configuration
-ml.aai.BASE_URL=https://c1.vm1.aai.simpledemo.openecomp.org:8443
-ml.aai.MODEL_URL=/aai/v10/service-design-and-creation/models/model/
-ml.aai.NAMED_QUERY_URL=/aai/v10/service-design-and-creation/named-queries/named-query/
-ml.aai.VNF_IMAGE_URL=/aai/v8/service-design-and-creation/vnf-images
-ml.aai.KEYSTORE_FILE=aai-os-cert.p12
-ml.aai.KEYSTORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o
-ml.aai.AUTH_USER=ModelLoader
-ml.aai.AUTH_PASSWORD=OBF:1qvu1v2h1sov1sar1wfw1j7j1wg21saj1sov1v1x1qxw
diff --git a/kubernetes/consul/resources/config/consul-agent-config/mr-health.json b/kubernetes/consul/resources/config/consul-agent-config/mr-health.json
deleted file mode 100644
index d8c056f006..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/mr-health.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: DMaaP",
-    "checks":[
-      {
-      "id": "dmaap",
-      "name": "Health Check: Message Router",
-      "http": "http://message-router:3904/topics",
-      "tls_skip_verify": true,
-      "interval": "30s",
-      "timeout": "1s"
-      },
-      {
-      "id": "mr-zookeeper",
-      "name": "Health Check: Message Router - ZooKeeper",
-      "script": "/consul/scripts/mr-zookeeper-health.sh",
-      "interval": "10s",
-      "timeout": "5s"
-      },
-      {
-      "id": "mr-kafka",
-      "name": "Health Check: Message Router - Kafka",
-      "script": "/consul/scripts/mr-kafka-health.sh",
-      "interval": "30s",
-      "timeout": "5s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/msb-health.json b/kubernetes/consul/resources/config/consul-agent-config/msb-health.json
deleted file mode 100644
index ad4e422be1..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/msb-health.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: MSB",
-    "checks": [
-      {
-        "id": "msb-eag",
-        "name": "MSB eag Health Check",
-        "http": "http://msb-eag:80/iui/microservices/default.html",
-        "method": "HEAD",
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "msb-iag",
-        "name": "MSB iag Health Check",
-        "http": "http://msb-iag:80/iui/microservices/default.html",
-        "method": "HEAD",
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "msb-consul",
-        "name": "MSB consul Health Check",
-        "tcp": "msb-consul:8500",
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "msb-discovery",
-        "name": "MSB discovery Health Check",
-        "tcp": "msb-discovery:10081",
-        "interval": "15s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/multicloud-health-check.json b/kubernetes/consul/resources/config/consul-agent-config/multicloud-health-check.json
deleted file mode 100644
index f6e48fac6b..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/multicloud-health-check.json
+++ /dev/null
@@ -1,77 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: MULTICLOUD",
-    "checks": [
-      {
-        "id": "framework",
-        "name": "Framework Health Check",
-        "http": "http://framework:9001/api/multicloud/v0/swagger.json",
-        "method": "HEAD",
-        "header": {
-          "Cache-Control": ["no-cache"],
-          "Content-Type": ["application/json"],
-          "Accept": ["application/json"]
-        },
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "multicloud-pike",
-        "name": "Multicloud Pike Health Check",
-        "http": "http://multicloud-pike:9007/api/multicloud-pike/v0/swagger.json",
-        "method": "HEAD",
-        "header": {
-          "Cache-Control": ["no-cache"],
-          "Content-Type": ["application/json"],
-          "Accept": ["application/json"]
-        },
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "multicloud-starlingx",
-        "name": "Multicloud Starlingx Health Check",
-        "http": "http://multicloud-starlingx:9009/api/multicloud-starlingx/v0/swagger.json",
-        "method": "HEAD",
-        "header": {
-          "Cache-Control": ["no-cache"],
-          "Content-Type": ["application/json"],
-          "Accept": ["application/json"]
-        },
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "multicloud-vio",
-        "name": "Multicloud Vio Health Check",
-        "http": "http://multicloud-vio:9004/api/multicloud-vio/v0/swagger.json",
-        "method": "HEAD",
-        "header": {
-          "Cache-Control": ["no-cache"],
-          "Content-Type": ["application/json"],
-          "Accept": ["application/json"]
-        },
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "multicloud-windriver",
-        "name": "Multicloud Windriver Health Check",
-        "http": "http://multicloud-windriver:9005/api/multicloud-titaniumcloud/v1/swagger.json",
-        "method": "HEAD",
-        "header": {
-          "Cache-Control": ["no-cache"],
-          "Content-Type": ["application/json"],
-          "Accept": ["application/json"]
-        },
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/policy-health.json b/kubernetes/consul/resources/config/consul-agent-config/policy-health.json
deleted file mode 100644
index 9cad9dc1d5..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/policy-health.json
+++ /dev/null
@@ -1,111 +0,0 @@
-{
-  "service": {
-  "name": "Health Check: Policy",
-  "checks": [
-  {
-    "id": "Policy-mariadb-healthcheck",
-    "name": "Policy Mariadb Health Check",
-    "script": "/consul/scripts/policy-mariadb-script.sh",
-    "interval": "10s",
-    "timeout": "1s"
-  },
-  {
-    "id": "policy-nexus-local-status",
-    "name": "Policy Nexus Local Status",
-    "http": "http://nexus:8081/nexus/service/local/status",
-    "method": "GET",
-    "header": {
-      "Authorization": ["Basic YWRtaW46YWRtaW4xMjM="],
-      "Cache-Control": ["no-cache"],
-      "Content-Type": ["application/json"],
-      "Accept": ["application/json"]
-    },
-    "tls_skip_verify": true,
-    "interval": "15s",
-    "timeout": "1s"
-  },
-  {
-    "id": "policy-nexus-internal-metrics",
-    "name": "Policy Nexus Internal Metrics",
-    "http": "http://nexus:8081/nexus/internal/metrics",
-    "method": "GET",
-    "header": {
-      "Authorization": ["Basic YWRtaW46YWRtaW4xMjM="],
-      "Cache-Control": ["no-cache"],
-      "Content-Type": ["application/json"],
-      "Accept": ["application/json"]
-    },
-    "tls_skip_verify": true,
-    "interval": "15s",
-    "timeout": "1s"
-  },
-  {
-    "id": "policy-nexus-internal-healthcheck",
-    "name": "Policy Nexus Internal Healthcheck",
-    "http": "http://nexus:8081/nexus/internal/healthcheck",
-    "method": "GET",
-    "header": {
-      "Authorization": ["Basic YWRtaW46YWRtaW4xMjM="],
-      "Cache-Control": ["no-cache"],
-      "Content-Type": ["application/json"],
-      "Accept": ["application/json"]
-    },
-    "tls_skip_verify": true,
-    "interval": "15s",
-    "timeout": "1s"
-  },
-  {
-    "id": "brmsgw-tcp",
-    "name": "BRMSGW Health Check",
-    "tcp": "brmsgw:9989",
-    "interval": "15s",
-    "timeout": "1s"
-  },
-  {
-    "id": "drools",
-    "name": "Drools Health Check",
-    "http": "https://drools:6969/healthcheck",
-    "method": "GET",
-    "header": {
-      "Authorization": ["Basic ZGVtb0BwZW9wbGUub3NhYWYub3JnOmRlbW8xMjM0NTYh"],
-      "Cache-Control": ["no-cache"],
-      "Content-Type": ["application/json"],
-      "Accept": ["application/json"]
-    },
-    "tls_skip_verify": true,
-    "interval": "15s",
-    "timeout": "1s"
-  },
-  {
-    "id": "pap",
-    "name": "PAP Health Check",
-    "http": "https://pap:9091/pap/test",
-    "method": "GET",
-    "header": {
-      "Authorization": ["Basic dGVzdHBhcDphbHBoYTEyMw=="],
-      "Cache-Control": ["no-cache"],
-      "Content-Type": ["application/json"],
-      "Accept": ["application/json"]
-    },
-    "tls_skip_verify": true,
-    "interval": "15s",
-    "timeout": "1s"
-  },
-  {
-    "id": "pdp",
-    "name": "PDP Health Check",
-    "http": "https://pdp:8081/pdp/test",
-    "method": "GET",
-    "header": {
-      "Authorization": ["Basic dGVzdHBkcDphbHBoYTEyMw=="],
-      "Cache-Control": ["no-cache"],
-      "Content-Type": ["application/json"],
-      "Accept": ["application/json"]
-    },
-    "tls_skip_verify": true,
-    "interval": "15s",
-    "timeout": "1s"
-   }
-  ]
- }
-}
diff --git a/kubernetes/consul/resources/config/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
deleted file mode 100644
index a6e084cfea..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/aai-search-storage-write-doc.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-{
-        "vnfId" : "testwrite",
-        "device" : "10.198.1.31",
-        "timestamp" : "2017-08-23T19:13:56Z",
-        "jdmTotalMem" : "2097152",
-        "jdmAvailableMem" : "1877272",
-        "jdmUserCpu" : "16",
-        "jdmSystemCpu" : "3"
-}
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
deleted file mode 100755
index 91223f527e..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/aai-search-storage-write-script.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh
-
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-if curl -s -X PUT http://aai-elasticsearch: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:9200/searchhealth/stats/testwrite | grep '\"failed\":0'; then
-      if curl -s -X GET http://aai-elasticsearch: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/clamp-mariadb-script.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/clamp-mariadb-script.sh
deleted file mode 100644
index 1b721b363c..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/clamp-mariadb-script.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-NAME=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "[^[:space:]]*-clampdb[^[:space:]]*")
-
-   if [ -n "$NAME" ]; then
-       if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $NAME -- sh -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then
-         echo Success. CLAMP DBHost is running. 2>&1
-         exit 0
-      else
-         echo Failed. CLAMP DBHost is not running. 2>&1
-         exit 1
-      fi
-   else
-      echo Failed. CLAMP DBHost is offline. 2>&1
-      exit 1
-   fi
-
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/data-router-script.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/data-router-script.sh
deleted file mode 100755
index 2e0078c72f..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/data-router-script.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-NAME=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "aai-data-router[^[:space:]]*")
-
-if [ -n "$NAME" ]; then
-   if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $NAME -- ps -efww | grep 'java' | grep 'data-router' > /dev/null; then
-
-      echo Success. Synapse process is running. 2>&1
-      exit 0
-   else
-      echo Failed. Synapse process is not running. 2>&1
-      exit 1
-   fi
-else
-   echo Failed. Synapse container is offline. 2>&1
-   exit 1
-fi
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/model-loader-script.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/model-loader-script.sh
deleted file mode 100755
index e049402578..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/model-loader-script.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-NAME=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "aai-model-loader[^[:space:]]*")
-
-if [ -n "$NAME" ]; then
-   if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $NAME -- ps -efww | grep 'java' | grep 'model-loader' > /dev/null; then
-
-      echo Success. Model Loader process is running. 2>&1
-      exit 0
-   else
-      echo Failed. Model Loader process is not running. 2>&1
-      exit 1
-   fi
-else
-   echo Failed. Model Loader container is offline. 2>&1
-   exit 1
-fi
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh
deleted file mode 100755
index 816a0103f6..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-kafka-health.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-kafkapod=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "[^[:space:]]*-message-router-kafka-[^[:space:]]*")
-if [ -n "$kafkapod" ]; then
-   if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $kafkapod -- ps ef | grep -i kafka; then
-      echo Success. Kafka process is running. 2>&1
-      exit 0
-   else
-      echo Failed. Kafka is not running. 2>&1
-      exit 1
-   fi
-else
-   echo Failed. Kafka container is offline. 2>&1
-   exit 1
-fi
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-zookeeper-health.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-zookeeper-health.sh
deleted file mode 100755
index debcfd1868..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/mr-zookeeper-health.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-zkpod=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "[^[:space:]]*-message-router-zookeeper-[^[:space:]]*")
-if [ -n "$zkpod" ]; then
-   if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $zkpod -- ps aux | grep -i zookeeper; then
-      echo Success. Zookeeper process is running. 2>&1
-      exit 0
-   else
-      echo Failed. Zookeeper is not running. 2>&1
-      exit 1
-   fi
-else
-   echo Failed. Zookeeper container is offline. 2>&1
-   exit 1
-fi
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/policy-mariadb-script.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/policy-mariadb-script.sh
deleted file mode 100644
index 865d477b7d..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/policy-mariadb-script.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-NAME=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "[^[:space:]]*-policydb[^[:space:]]*")
-
-   if [ -n "$NAME" ]; then
-       if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $NAME -- sh -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then
-         echo Success. mariadb process is running. 2>&1
-         exit 0
-      else
-         echo Failed. mariadb process is not running. 2>&1
-         exit 1
-      fi
-   else
-      echo Failed. mariadb container is offline. 2>&1
-      exit 1
-   fi
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-be-script.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-be-script.sh
deleted file mode 100755
index c362ffed34..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-be-script.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-## Query the health check API.
-HEALTH_CHECK_ENDPOINT="http://sdc-fe: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
-## get duplicate results when we search for component BE) and check to see if
-## the BE component is reported as up.
-READY=$(echo "$HEALTH_CHECK_RESPONSE" | sed '/ON_BOARDING/,/]/d' | grep -A 1 "BE" | grep "UP")
-
-if [ -n $READY ]; then
-  echo "Query against health check endpoint: $HEALTH_CHECK_ENDPOINT"
-  echo "Produces response: $HEALTH_CHECK_RESPONSE"
-  echo "Application is not in an available state"
-  return 2
-else
-  echo "Application is available."
-  return 0
-fi
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-cs-script.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-cs-script.sh
deleted file mode 100755
index 18b5b9d4bd..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-cs-script.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-## Query the health check API.
-HEALTH_CHECK_ENDPOINT="http://sdc-fe: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
-## get duplicate results when we search for component CASSANDRA) and check to see if
-## the CASSANDRA component is reported as up.
-READY=$(echo "$HEALTH_CHECK_RESPONSE" | sed '/ON_BOARDING/,/]/d' | grep -A 1 "CASSANDRA" | grep "UP")
-
-if [ -n $READY ]; then
-  echo "Query against health check endpoint: $HEALTH_CHECK_ENDPOINT"
-  echo "Produces response: $HEALTH_CHECK_RESPONSE"
-  echo "Application is not in an available state"
-  return 2
-else
-  echo "Application is available."
-  return 0
-fi
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-fe-script.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-fe-script.sh
deleted file mode 100755
index 21a2b80a3d..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-fe-script.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-## Query the health check API.
-HEALTH_CHECK_ENDPOINT="http://sdc-fe: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
-## get duplicate results when we search for component FE) and check to see if
-## the FE component is reported as up.
-READY=$(echo "$HEALTH_CHECK_RESPONSE" | sed '/ON_BOARDING/,/]/d' | grep -A 1 "FE" | grep "UP")
-
-if [ -n $READY ]; then
-  echo "Query against health check endpoint: $HEALTH_CHECK_ENDPOINT"
-  echo "Produces response: $HEALTH_CHECK_RESPONSE"
-  echo "Application is not in an available state"
-  return 2
-else
-  echo "Application is available."
-  return 0
-fi
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-titan-script.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-titan-script.sh
deleted file mode 100755
index fad3ddb293..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/sdc-titan-script.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-## Query the health check API.
-HEALTH_CHECK_ENDPOINT="http://sdc-fe: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
-## get duplicate results when we search for component TITAN) and check to see if
-## the TITAN component is reported as up.
-READY=$(echo "$HEALTH_CHECK_RESPONSE" | sed '/ON_BOARDING/,/]/d' | grep -A 1 "TITAN" | grep "UP")
-
-if [ -n $READY ]; then
-  echo "Query against health check endpoint: $HEALTH_CHECK_ENDPOINT"
-  echo "Produces response: $HEALTH_CHECK_RESPONSE"
-  echo "Application is not in an available state"
-  return 2
-else
-  echo "Application is available."
-  return 0
-fi
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/sdnc-cluster-health.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/sdnc-cluster-health.sh
deleted file mode 100755
index ed7aefc0cf..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/sdnc-cluster-health.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-{{/*
-
-# Copyright © 2018 Amdocs
-# Modifications Copyright © 2018 AT&T
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-# query ODL cluster state
-USERNAME="{{.Values.odl.jolokia.username}}"
-PASSWORD="{{.Values.odl.jolokia.password}}"
-
-count=${SDNC_ODL_COUNT:-1}
-siteId=0
-if [ "$SDNC_IS_PRIMARY_CLUSTER" = "false" ];then
-  siteId=1
-fi
-
-for instance in $(seq $count);do
-  shard=member-$(( $siteId*$count + $instance ))-shard-default-config
-  mbean=Category=Shards,name=$shard,type=DistributedConfigDatastore
-  url=http://{{ include "common.release" . }}-sdnc-$(( $instance-1 )).sdnc-cluster.{{.Release.Namespace}}:8181/jolokia/read/org.opendaylight.controller:$mbean
-
-  response=$( curl -s -u $USERNAME:$PASSWORD $url )
-  rc=$?
-  if [ $rc -ne 0 ];then
-    # failed to contact SDN-C instance - try another
-    echo "Unable to connect to $shard [rc=$?]"
-    continue
-  fi
-
-  status=$( echo "$response" | jq -r ".status" )
-  if [ "$status" != "200" ];then
-    # query failed, try another instance
-    echo "$shard query failed [http-status=$status]"
-    continue
-  fi
-
-  raftState=$( echo "$response" | jq -r ".value.RaftState" )
-  if [ "$raftState" = "Leader" -o "$raftState" = "Follower" ];then
-    # cluster has a leader and is healthy
-    echo "$shard is healthy [RaftState=$raftState]"
-    exit 0
-  else
-    echo "$shard is not healthy [RaftState=$raftState]"
-  fi
-done
-
-# ODL cluster is not healthy
-exit 2
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
deleted file mode 100755
index c0fbcfbbe3..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/sdnc-dbhost-script.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-SDNC_DBHOST_POD=$(/consul/bin/kubectl -n {{ include "common.namespace" . }}  get pod | grep -o "sdnc-dbhost-[^[:space:]]*")
-if [ -n "$SDNC_DBHOST_POD" ]; then
-   if /consul/bin/kubectl -n {{ include "common.namespace" . }} 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/consul/resources/config/consul-agent-config/scripts/search-data-service-availability.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/search-data-service-availability.sh
deleted file mode 100644
index 68ab27dbc9..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/search-data-service-availability.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-{{/*
-
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-SEARCH_SERVICE_NAME="search-data-service.{{ include "common.namespace" . }}"
-SEARCH_SERVICE_PORT=9509
-HEALTH_CHECK_INDEX="healthcheck"
-
-# 'Document Index' REST Endpoint
-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/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.
-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=" "
-
-if [ $CREATE_INDEX_RESP -eq 201 ]; then
-   RESULT_STRING="Service Is Able To Communicate With Back End"
-elif [ $CREATE_INDEX_RESP -eq 400 ]; then
-   # A 400 response could mean that the index already exists (ie: we didn't
-   # clean up after ourselves on a previous check), so log the response but
-   # don't exit yet.  If we fail on the delete then we can consider the
-   # check a failure, otherwise, we are good.
-   RESULT_STRING="$RESULT_STRING Create Index [FAIL - 400 (possible index already exists)] "
-else
-   RESULT_STRING="Service API Failure - $CREATE_INDEX_RESP"
-   echo $RESULT_STRING
-   exit 1
-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)
-
-if [ $DELETE_INDEX_RESP -eq 200 ]; then
-   RESULT_STRING="Service Is Able To Communicate With Back End"
-else
-   RESULT_STRING="Service API Failure - $DELETE_INDEX_RESP"
-   echo $RESULT_STRING
-   exit 1
-fi
-
-echo $RESULT_STRING
-return 0
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/so-api-script.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/so-api-script.sh
deleted file mode 100755
index e0acea7ce9..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/so-api-script.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-## Query the health check API.
-HEALTH_CHECK_ENDPOINT="http://so:8080/ecomp/mso/infra/healthcheck"
-HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
-
-READY=$(echo $HEALTH_CHECK_RESPONSE | grep "Application ready")
-
-if [ -n $READY ]; then
-  echo "Query against health check endpoint: $HEALTH_CHECK_ENDPOINT"
-  echo "Produces response: $HEALTH_CHECK_RESPONSE"
-  echo "Application is not in an available state"
-  return 2
-else
-  echo "Application is available."
-  return 0
-fi
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/so-camunda-script.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/so-camunda-script.sh
deleted file mode 100755
index 2ef5f8c4dd..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/so-camunda-script.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-## Query the health check API.
-HEALTH_CHECK_ENDPOINT="http://so:8080/mso/healthcheck"
-HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
-
-READY=$(echo $HEALTH_CHECK_RESPONSE | grep "Application ready")
-
-if [ -n $READY ]; then
-  echo "Query against health check endpoint: $HEALTH_CHECK_ENDPOINT"
-  echo "Produces response: $HEALTH_CHECK_RESPONSE"
-  echo "Application is not in an available state"
-  return 2
-else
-  echo "Application is available."
-  return 0
-fi
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/so-jra-script.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/so-jra-script.sh
deleted file mode 100755
index deee34c001..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/so-jra-script.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-## Query the health check API.
-HEALTH_CHECK_ENDPOINT="http://so:8080/networks/rest/healthcheck"
-HEALTH_CHECK_RESPONSE=$(curl -s $HEALTH_CHECK_ENDPOINT)
-
-READY=$(echo $HEALTH_CHECK_RESPONSE | grep "Application ready")
-
-if [ -n $READY ]; then
-  echo "Query against health check endpoint: $HEALTH_CHECK_ENDPOINT"
-  echo "Produces response: $HEALTH_CHECK_RESPONSE"
-  echo "Application is not in an available state"
-  return 2
-else
-  echo "Application is available."
-  return 0
-fi
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/so-mariadb-script.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/so-mariadb-script.sh
deleted file mode 100755
index a0974c0a45..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/so-mariadb-script.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-NAME=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "[^[:space:]]*-so-db[^[:space:]]*")
-
-   if [ -n "$NAME" ]; then
-       if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $NAME -- sh -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then
-         echo Success. mariadb process is running. 2>&1
-         exit 0
-      else
-         echo Failed. mariadb process is not running. 2>&1
-         exit 1
-      fi
-   else
-      echo Failed. mariadb container is offline. 2>&1
-      exit 1
-   fi
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/sparky-be-script.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/sparky-be-script.sh
deleted file mode 100755
index 19134cfa76..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/sparky-be-script.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-NAME=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "aai-sparky-be[^[:space:]]*")
-
-if [ -n "$NAME" ]; then
-   if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $NAME -- ps -efww | grep 'java' | grep 'sparky' > /dev/null; then
-
-      echo Success. UI Backend Service process is running. 2>&1
-      exit 0
-   else
-      echo Failed. UI Backend Service process is not running. 2>&1
-      exit 1
-   fi
-else
-   echo Failed. UI Backend Service container is offline. 2>&1
-   exit 1
-fi
diff --git a/kubernetes/consul/resources/config/consul-agent-config/scripts/vid-mariadb-script.sh b/kubernetes/consul/resources/config/consul-agent-config/scripts/vid-mariadb-script.sh
deleted file mode 100755
index 7b0bc246f6..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/scripts/vid-mariadb-script.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-NAME=$(/consul/bin/kubectl -n {{ include "common.namespace" . }} get pod | grep -o "[^[:space:]]*-vid-mariadb[^[:space:]]*")
-
-   if [ -n "$NAME" ]; then
-       if /consul/bin/kubectl -n {{ include "common.namespace" . }} exec -it $NAME -- sh -c 'mysqladmin status -u root -p$MYSQL_ROOT_PASSWORD' > /dev/null; then
-         echo Success. mariadb process is running. 2>&1
-         exit 0
-      else
-         echo Failed. mariadb process is not running. 2>&1
-         exit 1
-      fi
-   else
-      echo Failed. mariadb container is offline. 2>&1
-      exit 1
-   fi
diff --git a/kubernetes/consul/resources/config/consul-agent-config/sdc-health.json b/kubernetes/consul/resources/config/consul-agent-config/sdc-health.json
deleted file mode 100644
index 105635b592..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/sdc-health.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: SDC",
-    "checks": [
-      {
-        "id": "sdc-fe-healthcheck",
-        "name": "SDC Front End Health Check",
-        "script": "/consul/scripts/sdc-fe-script.sh",
-        "interval": "10s",
-        "timeout": "1s"
-      },
-      {
-        "id": "sdc-be-healthcheck",
-        "name": "SDC Back End Health Check",
-        "script": "/consul/scripts/sdc-be-script.sh",
-        "interval": "10s",
-        "timeout": "1s"
-      },
-      {
-        "id": "sdc-titan-healthcheck",
-        "name": "SDC Titan Health Check",
-        "script": "/consul/scripts/sdc-titan-script.sh",
-        "interval": "10s",
-        "timeout": "1s"
-      },
-      {
-        "id": "sdc-cs-healthcheck",
-        "name": "SDC Cassandra Health Check",
-        "script": "/consul/scripts/sdc-cs-script.sh",
-        "interval": "10s",
-        "timeout": "1s"
-      },
-      {
-        "id": "sdc-catalog-healthcheck",
-        "name": "SDC Catalog Health Check",
-        "http": "https://sdc-be:8443/asdc/v1/catalog/services",
-        "header": {
-          "Authorization": ["Basic dmlkOktwOGJKNFNYc3pNMFdYbGhhazNlSGxjc2UyZ0F3ODR2YW9HR21KdlV5MlU="],
-          "X-ECOMP-InstanceID": ["VID"],
-          "Content-Type": ["application/json"],
-          "Accept": ["application/json"]
-        },
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/sdnc-cluster-health.json b/kubernetes/consul/resources/config/consul-agent-config/sdnc-cluster-health.json
deleted file mode 100644
index 86a7630392..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/sdnc-cluster-health.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: SDNC ODL Cluster",
-    "checks": [
-      {
-        "id": "sdnc-odl-cluster-healthcheck",
-        "name": "SDNC ODL Cluster Health Check",
-        "script": "/consul/scripts/sdnc-cluster-health.sh",
-        "interval": "15s",
-        "timeout": "10s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/sdnc-dbhost.json b/kubernetes/consul/resources/config/consul-agent-config/sdnc-dbhost.json
deleted file mode 100644
index ea0ae562e9..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/sdnc-dbhost.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: SDNC - DB Host",
-    "checks": [
-      {
-        "id": "sdnc-dbhost-healthcheck",
-        "name": "SDNC DBHOST Health Check",
-        "script": "/consul/scripts/sdnc-dbhost-script.sh",
-        "interval": "10s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/sdnc-dgbuilder.json b/kubernetes/consul/resources/config/consul-agent-config/sdnc-dgbuilder.json
deleted file mode 100644
index 72e6be9093..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/sdnc-dgbuilder.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: SDNC - DGBuilder",
-    "checks": [
-      {
-        "id": "sdnc-dgbuilder",
-        "name": "SDNC-DGbuilder Health Check",
-        "http": "http://sdnc-dgbuilder:3000/",
-        "method": "HEAD",
-        "header": {
-          "Authorization": ["Basic ZGd1c2VyOnRlc3QxMjM="],
-          "Cache-Control": ["no-cache"],
-          "Content-Type": ["application/json"],
-          "Accept": ["application/json"]
-        },
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/sdnc-health.json b/kubernetes/consul/resources/config/consul-agent-config/sdnc-health.json
deleted file mode 100644
index 5f42835cf7..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/sdnc-health.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: SDNC",
-    "checks": [
-      {
-        "id": "odl-api-healthcheck",
-        "name": "SDNC API Health Check",
-        "http": "http://sdnc:8282/restconf/operations/SLI-API:healthcheck",
-        "method": "POST",
-        "header": {
-          "Authorization": ["Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="],
-          "Cache-Control": ["no-cache"],
-          "Content-Type": ["application/json"],
-          "Accept": ["application/json"]
-        },
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnctldb01-healthcheck.json b/kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnctldb01-healthcheck.json
deleted file mode 100644
index ed196bd0cf..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnctldb01-healthcheck.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: SDNC-SDN-CTL-DB-01",
-    "checks": [
-      {
-        "id": "sdnctldb01",
-        "name": "SDNC SDNCTLDB01 Health Check",
-        "tcp": "sdnc-sdnctldb01:3306",
-        "interval": "10s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnctldb02-healthcheck.json b/kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnctldb02-healthcheck.json
deleted file mode 100644
index b63329f544..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnctldb02-healthcheck.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: SDNC-SDN-CTL-DB-02",
-    "checks": [
-      {
-        "id": "sdnctldb02",
-        "name": "SDNC SDNCTLDB02 Health Check",
-        "tcp": "sdnc-sdnctldb02:3306",
-        "interval": "10s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnhost.json b/kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnhost.json
deleted file mode 100644
index db84164fc7..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/sdnc-sdnhost.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: SDNC - SDN Host",
-    "checks": [
-      {
-        "id": "sdnc-sdnhost",
-        "name": "SDNC SDN Host Health Check",
-        "http": "http://sdnc:8282/apidoc/explorer/index.html",
-        "method": "HEAD",
-        "header": {
-          "Authorization": ["Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="],
-          "Cache-Control": ["no-cache"],
-          "Content-Type": ["application/json"],
-          "Accept": ["application/json"]
-        },
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/so-health.json b/kubernetes/consul/resources/config/consul-agent-config/so-health.json
deleted file mode 100644
index 565c4a4a7a..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/so-health.json
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: SO",
-    "checks": [
-      {
-        "id": "so-api-healthcheck",
-        "name": "SO API Health Check",
-        "script": "/consul/scripts/so-api-script.sh",
-        "interval": "10s",
-        "timeout": "1s"
-      },
-      {
-        "id": "so-camunda-healthcheck",
-        "name": "SO Camunda Health Check",
-        "script": "/consul/scripts/so-camunda-script.sh",
-        "interval": "10s",
-        "timeout": "1s"
-      },
-      {
-        "id": "so-jra-healthcheck",
-        "name": "SO JRA Health Check",
-        "script": "/consul/scripts/so-jra-script.sh",
-        "interval": "10s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/so-mariabdb.json b/kubernetes/consul/resources/config/consul-agent-config/so-mariabdb.json
deleted file mode 100644
index fb554208e4..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/so-mariabdb.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: SO - MariaDb",
-    "checks": [
-      {
-          "id": "so-mariadb",
-          "name": "SO Mariadb Health Check",
-          "script": "/consul/scripts/so-mariadb-script.sh",
-          "interval": "10s",
-          "timeout": "1s"
-      }
-    ]
-
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/vfc-health.json b/kubernetes/consul/resources/config/consul-agent-config/vfc-health.json
deleted file mode 100644
index 3661ac708b..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/vfc-health.json
+++ /dev/null
@@ -1,119 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: VFC",
-    "checks": [
-      {
-        "id": "vfc-catalog",
-        "name": "VFC catalog Health Check",
-        "tcp": "vfc-catalog:8806",
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "vfc-emsdriver",
-        "name": "VFC emsdriver Health Check",
-        "tcp": "vfc-ems-driver:8206",
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "vfc-gvnfmdriver",
-        "name": "VFC gvnfmdriver Health Check",
-        "tcp": "vfc-generic-vnfm-driver:8484",
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "vfc-hwvnfmdriver",
-        "name": "VFC hwvnfmdriver Health Check",
-        "tcp": "vfc-huawei-vnfm-driver:8482",
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "vfc-jujudriver",
-        "name": "VFC jujudriver Health Check",
-        "tcp": "vfc-juju-vnfm-driver:8483",
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "vfc-nokiavnfmdriver",
-        "name": "VFC nokiavnfmdriver Health Check",
-        "tcp": "vfc-nokia-vnfm-driver:8486",
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "vfc-nokiav2vnfmdriver",
-        "name": "VFC nokiav2vnfmdriver Health Check",
-        "tcp": "vfc-nokia-v2vnfm-driver:8089",
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "vfc-nslcm",
-        "name": "VFC nslcm Health Check",
-        "tcp": "vfc-nslcm:8403",
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "vfc-resmgr",
-        "name": "VFC resmgr Health Check",
-        "tcp": "vfc-resmgr:8480",
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "vfc-vnflcm",
-        "name": "VFC vnflcm Health Check",
-        "tcp": "vfc-vnflcm:8801",
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "vfc-vnfmgr",
-        "name": "VFC vnfmgr Health Check",
-        "tcp": "vfc-vnfmgr:8803",
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "vfc-vnfres",
-        "name": "VFC vnfres Health Check",
-        "tcp": "vfc-vnfres:8802",
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "vfc-workflow",
-        "name": "VFC workflow Health Check",
-        "tcp": "vfc-workflow:10550",
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "vfc-workflowengineactiviti",
-        "name": "VFC workflow-engine Health Check",
-        "tcp": "vfc-workflow-engine:8080",
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "vfc-ztesdncdriver",
-        "name": "VFC ztesdncdriver Health Check",
-        "tcp": "vfc-zte-sdnc-driver:8411",
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-        "id": "vfc-ztevnfmdriver",
-        "name": "VFC ztevnfmdriver Health Check",
-        "tcp": "vfc-zte-vnfm-driver:8410",
-        "interval": "15s",
-        "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/resources/config/consul-agent-config/vid-health.json b/kubernetes/consul/resources/config/consul-agent-config/vid-health.json
deleted file mode 100644
index d6d8d4c03d..0000000000
--- a/kubernetes/consul/resources/config/consul-agent-config/vid-health.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  "service": {
-    "name": "Health Check: VID",
-    "checks": [
-      {
-        "id": "vid-server",
-        "name": "VID Server Health Check",
-        "http": "http://vid:8080/vid/healthCheck",
-        "method": "GET",
-        "header": {
-          "Authorization": ["Basic YWRtaW46S3A4Yko0U1hzek0wV1hsaGFrM2VIbGNzZTJnQXc4NHZhb0dHbUp2VXkyVQ=="],
-          "Cache-Control": ["no-cache"],
-          "Content-Type": ["application/json"],
-          "Accept": ["application/json"]
-        },
-        "tls_skip_verify": true,
-        "interval": "15s",
-        "timeout": "1s"
-      },
-      {
-          "id": "vid-mariadb",
-          "name": "Vid Mariadb Health Check",
-          "script": "/consul/scripts/vid-mariadb-script.sh",
-          "interval": "10s",
-          "timeout": "1s"
-      }
-    ]
-  }
-}
diff --git a/kubernetes/consul/templates/configmap.yaml b/kubernetes/consul/templates/configmap.yaml
deleted file mode 100644
index 42c8cba6b4..0000000000
--- a/kubernetes/consul/templates/configmap.yaml
+++ /dev/null
@@ -1,42 +0,0 @@
-{{/*
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-configmap
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/consul-agent-config/*").AsConfig . | indent 2 }}
----
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  name: {{ include "common.fullname" . }}-scripts-configmap
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/consul-agent-config/scripts/*").AsConfig . | indent 2 }}
diff --git a/kubernetes/consul/templates/deployment.yaml b/kubernetes/consul/templates/deployment.yaml
deleted file mode 100644
index c5d12a4693..0000000000
--- a/kubernetes/consul/templates/deployment.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-{{/*
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: {{ include "common.fullname" . }}
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
-spec:
-  replicas: {{ .Values.replicaCount }}
-  selector:
-    matchLabels:
-      app: {{ include "common.name" . }}
-  template:
-    metadata:
-      labels:
-        app: {{ include "common.name" . }}
-        release: {{ include "common.release" . }}
-      name: {{ include "common.name" . }}
-    spec:
-      imagePullSecrets:
-      - name: "{{ include "common.namespace" . }}-docker-registry-key"
-      initContainers:
-      - name: {{ include "common.name" . }}-chown
-        image: {{ .Values.global.busyboxRepository | default .Values.busyboxRepository }}/{{ .Values.global.busyboxImage | default .Values.busyboxImage }}
-        command:
-        - sh
-        args:
-        - -c
-        - |
-          cp -r -L /tmp/consul/config/* /consul/config/
-          chown -R {{ .Values.consulUID }}:{{ .Values.consulGID }} /consul/config
-          ls -la /consul/config
-        volumeMounts:
-        - mountPath: /tmp/consul/config
-          name: consul-agent-config
-        - mountPath: /consul/config
-          name: consul-agent-config-dir
-      containers:
-      - image: {{ include "repositoryGenerator.repository" . }}/{{ .Values.image }}
-        securityContext:
-          runAsUser: {{ .Values.securityContext.runAsUser }}
-          runAsGroup: {{ .Values.securityContext.runAsGroup }}
-        command:
-        - docker-entrypoint.sh
-        args:
-        - agent
-        - -client
-        - 0.0.0.0
-        - -enable-script-checks
-        - -retry-join
-        - {{ .Values.consulServer.nameOverride }}
-        name: {{ include "common.name" . }}
-        env:
-          - name: SDNC_ODL_COUNT
-            value: "{{ .Values.sdnc.replicaCount }}"
-          - name: SDNC_IS_PRIMARY_CLUSTER
-            value: "{{ .Values.sdnc.config.isPrimaryCluster }}"
-        volumeMounts:
-        - mountPath: /consul/config
-          name: consul-agent-config-dir
-        - mountPath: /consul/scripts
-          name: consul-agent-scripts-config
-        - mountPath: /consul/certs
-          name: consul-agent-certs-config
-        resources: {{ include "common.resources" . | nindent 10 }}
-      serviceAccountName: {{ include "common.fullname" (dict "suffix" "read" "dot" . )}}
-      volumes:
-      - name: consul-agent-config-dir
-        emptyDir: {}
-      - configMap:
-          name: {{ include "common.fullname" . }}-configmap
-        name: consul-agent-config
-      - configMap:
-          name: {{ include "common.fullname" . }}-scripts-configmap
-          defaultMode: 0755
-        name: consul-agent-scripts-config
-      - secret:
-          secretName: {{ include "common.fullname" . }}-certs-secret
-        name: consul-agent-certs-config
diff --git a/kubernetes/consul/templates/ingress.yaml b/kubernetes/consul/templates/ingress.yaml
deleted file mode 100644
index 8f87c68f1e..0000000000
--- a/kubernetes/consul/templates/ingress.yaml
+++ /dev/null
@@ -1 +0,0 @@
-{{ include "common.ingress" . }}
diff --git a/kubernetes/consul/templates/secrets.yaml b/kubernetes/consul/templates/secrets.yaml
deleted file mode 100644
index 27cfbf00d0..0000000000
--- a/kubernetes/consul/templates/secrets.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-{{/*
-# Copyright © 2018  AT&T, Amdocs, Bell Canada Intellectual Property.  All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-*/}}
-
-apiVersion: v1
-kind: Secret
-metadata:
-  name: {{ include "common.fullname" . }}-certs-secret
-  namespace: {{ include "common.namespace" . }}
-  labels:
-    app: {{ include "common.name" . }}
-    chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}
-    release: {{ include "common.release" . }}
-    heritage: {{ .Release.Service }}
-data:
-{{ tpl (.Files.Glob "resources/config/consul-agent-config/certs/*").AsSecrets . | indent 2 }}
diff --git a/kubernetes/consul/values.yaml b/kubernetes/consul/values.yaml
deleted file mode 100644
index 9036606377..0000000000
--- a/kubernetes/consul/values.yaml
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright © 2017 Amdocs, Bell Canada
-# Modifications Copyright © 2018 AT&T
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#       http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#################################################################
-# Global configuration defaults.
-#################################################################
-global:
-  nodePortPrefix: 302
-  busyboxRepository: registry.hub.docker.com
-  busyboxImage: library/busybox:latest
-
-#################################################################
-# Application configuration defaults.
-#################################################################
-# application image
-image: onap/oom/consul:2.1.0
-pullPolicy: Always
-
-#subchart name
-consulServer:
-  nameOverride: consul-server
-
-consulUID: 100
-consulGID: 1000
-
-# flag to enable debugging - application support required
-debugEnabled: false
-
-# default number of instances
-replicaCount: 1
-
-nodeSelector: {}
-
-affinity: {}
-
-# probe configuration parameters
-liveness:
-  initialDelaySeconds: 90
-  periodSeconds: 10
-  # necessary to disable liveness probe when setting breakpoints
-  # in debugger so K8s doesn't restart unresponsive container
-  enabled: true
-
-readiness:
-  initialDelaySeconds: 90
-  periodSeconds: 10
-
-service: {}
-
-ingress:
-  enabled: false
-  service:
-    - baseaddr: "consul-api"
-      name: "consul-server"
-      port: 8800
-  config:
-    ssl: "none"
-
-#resources: {}
-  # We usually recommend not to specify default resources and to leave this as a conscious
-  # choice for the user. This also increases chances charts run on environments with little
-  # resources, such as Minikube. If you do want to specify resources, uncomment the following
-  # lines, adjust them as necessary, and remove the curly braces after 'resources:'.
-  #
-  # Example:
-  # Configure resource requests and limits
-  # ref: http://kubernetes.io/docs/user-guide/compute-resources/
-  # Minimum memory for development is 2 CPU cores and 4GB memory
-  # Minimum memory for production is 4 CPU cores and 8GB memory
-resources:
-  small:
-    limits:
-      cpu: 1
-      memory: 1500Mi
-    requests:
-      cpu: 650m
-      memory: 530Mi
-  large:
-    limits:
-      cpu: 2
-      memory: 4Gi
-    requests:
-      cpu: 1
-      memory: 2Gi
-  unlimited: {}
-
-odl:
-  jolokia:
-    username: admin
-    password: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
-
-sdnc:
-  config:
-    isPrimaryCluster: true
-  replicaCount: 1
-
-securityContext:
-  fsGroup: 1000
-  runAsUser: 100
-  runAsGroup: 1000
-
-#Pods Service Account
-serviceAccount:
-  nameOverride: consul
-  roles:
-    - read