Restructuring the repo.

The idea is to restructure the existing repo create a deployment
independent of Vagrant or other hosting providers.
Renamed KRD to KUbernetes Deploy(Kud) including the ansible scripts
Added new path to functional tests.
Moved samples pdfs to sites.
Minor changes to Readme.
Updated aio.sh, moved sample config
Corrected other nits. Updated and verified test cases.
Addressed comments and changes associated with it.
Updated Readme and minor change in Vagrantfile.
Validated test cases again. Moved aio.sh into vagrant folder.
Added new README for each hosting provider and project on the whole.
Updated the installer script with relative path.
Updated the name to deployment_infra, moved the cFW sripcts to tests.
Updated the gitignore file.

Issue-ID: MULTICLOUD-301
Change-Id: Ie48c26b12ab58b604493fba58a9c5b9f8ba10942
Signed-off-by: Akhila Kishore <akhila.kishore@intel.com>

57 files changed, 0 insertions, 2118 deletions

diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/Chart.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/Chart.yaml
deleted file mode 100644
index d52b1925..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/Chart.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2018 Intel Corporation, Inc
-#
-# 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
-description: EdgeX foundry Helm Charts for testing purposes
-name: edgex
-version: 1.0.0
\ No newline at end of file
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/Chart.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/Chart.yaml
deleted file mode 100644
index 74fa86ca..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/Chart.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2018 Intel Corporation, Inc
-#
-# 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
-description: EdgeX foundry Consul Helm Charts for testing purposes
-name: edgex-consul
-version: 1.0.0
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/templates/consul-deployment.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/templates/consul-deployment.yaml
deleted file mode 100644
index 5db9b855..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/templates/consul-deployment.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  name: edgex-core-consul
-  labels:
-    app: edgex-core-consul
-    release: {{ .Release.Name }}
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: edgex-core-consul
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: edgex-core-consul
-        release: {{ .Release.Name }}
-    spec:
-      containers:
-      - image: edgexfoundry/docker-core-consul:latest
-        name: edgex-core-consul
-        ports:
-        {{- range $k, $v := .Values.service.ports }}
-        - containerPort: {{ $v.port }}
-        {{- end }}
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        persistentVolumeClaim:
-          claimName: {{ .Release.Name }}-edgex-data
-      - name: edgex-logs
-        persistentVolumeClaim:
-          claimName: {{ .Release.Name }}-edgex-logs
-      - name: consul-config
-        persistentVolumeClaim:
-          claimName: {{ .Release.Name }}-edgex-consul-config
-      - name: consul-data
-        persistentVolumeClaim:
-          claimName: {{ .Release.Name }}-edgex-consul-data
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/templates/consul-service.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/templates/consul-service.yaml
deleted file mode 100644
index 783edef8..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/templates/consul-service.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: {{ .Values.service.name }}
-    release: {{ .Release.Name }}
-  name: {{ .Values.service.name }}
-spec:
-  ports:
-  {{- range $k, $v := .Values.service.ports }}
-  - name: {{ $v.portName }}
-    port: {{ $v.port }}
-    targetPort: {{ $v.port }}
-  {{- end }}
-  selector:
-    app: edgex-core-consul
-    release: {{ .Release.Name }}
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/values.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/values.yaml
deleted file mode 100644
index bf7732df..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/charts/consul/values.yaml
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 2018 Intel Corporation, Inc
-#
-# 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:
-  persistence: {}
-#################################################################
-# Application configuration defaults.
-#################################################################
-
-# flag to enable debugging - application support required
-debugEnabled: false
-
-# default number of instances
-replicaCount: 1
-
-nodeSelector: {}
-
-affinity: {}
-
-# probe configuration parameters
-liveness:
-  initialDelaySeconds: 10
-  periodSeconds: 30
-  # necessary to disable liveness probe when setting breakpoints
-  # in debugger so K8s doesn't restart unresponsive container
-  enabled: true
-
-readiness:
-  initialDelaySeconds: 10
-  periodSeconds: 30
-
-service:
-  name: edgex-core-consul
-  ports:
-  - portName: consul-port-1
-    port: 8400
-  - portName: consul-port-2
-    port: 8500
-  - portName: consul-port-3
-    port: 8600
-
-ingress:
-  enabled: false
-
-# Configure resource requests and limits
-flavor: small
-resources:
-  small:
-    limits:
-      cpu: 200m
-      memory: 500Mi
-    requests:
-      cpu: 10m
-      memory: 10Mi
-  large:
-    limits:
-      cpu: 400m
-      memory: 1Gi
-    requests:
-      cpu: 10m
-      memory: 100Mi
-  unlimited: {}
\ No newline at end of file
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/Chart.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/Chart.yaml
deleted file mode 100644
index 19c4a324..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/Chart.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 2018 Intel Corporation, Inc
-#
-# 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
-description: EdgeX foundry Mongo Helm Charts for testing purposes
-name: edgex-mongo
-version: 1.0.0
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/templates/mongo-deployment.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/templates/mongo-deployment.yaml
deleted file mode 100644
index 3251309e..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/templates/mongo-deployment.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: edgex-mongo
-    release: {{ .Release.Name }}
-  name: edgex-mongo
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: edgex-mongo
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: edgex-mongo
-        release: {{ .Release.Name }}
-    spec:
-      containers:
-      - image: edgexfoundry/docker-edgex-mongo:0.2
-        name: edgex-mongo
-        ports:
-        - containerPort: {{ .Values.service.port }}
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        persistentVolumeClaim:
-          claimName: {{ .Release.Name }}-edgex-data
-      - name: edgex-logs
-        persistentVolumeClaim:
-          claimName: {{ .Release.Name }}-edgex-logs
-      - name: consul-config
-        persistentVolumeClaim:
-          claimName: {{ .Release.Name }}-edgex-consul-config
-      - name: consul-data
-        persistentVolumeClaim:
-          claimName: {{ .Release.Name }}-edgex-consul-data
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/templates/mongo-service.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/templates/mongo-service.yaml
deleted file mode 100644
index 5b30a45f..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/templates/mongo-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: {{ .Values.service.name }}
-    release: {{ .Release.Name }}
-  name: {{ .Values.service.name }}
-spec:
-  ports:
-  - name: {{ .Values.service.portName }}
-    port: {{ .Values.service.port }}
-    targetPort: {{ .Values.service.port }}
-  selector:
-    app: edgex-mongo
-    release: {{ .Release.Name }}
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/values.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/values.yaml
deleted file mode 100644
index e22b846a..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/charts/mongo/values.yaml
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 2018 Intel Corporation, Inc
-#
-# 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:
-  persistence: {}
-#################################################################
-# Application configuration defaults.
-#################################################################
-
-# flag to enable debugging - application support required
-debugEnabled: false
-
-# default number of instances
-replicaCount: 1
-
-nodeSelector: {}
-
-affinity: {}
-
-# probe configuration parameters
-liveness:
-  initialDelaySeconds: 10
-  periodSeconds: 30
-  # necessary to disable liveness probe when setting breakpoints
-  # in debugger so K8s doesn't restart unresponsive container
-  enabled: true
-
-readiness:
-  initialDelaySeconds: 10
-  periodSeconds: 30
-
-service:
-  name: edgex-mongo
-  portName: mongo
-  port: 27017
-
-ingress:
-  enabled: false
-
-# Configure resource requests and limits
-flavor: small
-resources:
-  small:
-    limits:
-      cpu: 200m
-      memory: 500Mi
-    requests:
-      cpu: 10m
-      memory: 10Mi
-  large:
-    limits:
-      cpu: 400m
-      memory: 1Gi
-    requests:
-      cpu: 10m
-      memory: 100Mi
-  unlimited: {}
\ No newline at end of file
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/command-deployment.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/command-deployment.yaml
deleted file mode 100644
index 1b43128c..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/command-deployment.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: edgex-core-command
-    release: {{ .Release.Name }}
-  name: edgex-core-command
-spec:
-  replicas: 1
-  selector:
-      matchLabels:
-        app: edgex-core-command
-        release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: edgex-core-command
-        release: {{ .Release.Name }}
-    spec:
-      containers:
-      - image: edgexfoundry/docker-core-command:0.2.1
-        name: edgex-core-command
-        ports:
-        - containerPort: {{ .Values.service.command.port }}
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-data
-      - name: edgex-logs
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-logs
-      - name: consul-config
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-config
-      - name: consul-data
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-data
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/command-service.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/command-service.yaml
deleted file mode 100644
index 7ffc7cce..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/command-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: {{ .Values.service.command.name }}
-    release: {{ .Release.Name }}
-  name: {{ .Values.service.command.name }}
-spec:
-  ports:
-  - name: {{ .Values.service.command.portName }}
-    port: {{ .Values.service.command.port }}
-    targetPort: {{ .Values.service.command.port }}
-  selector:
-    app: edgex-core-command
-    release: {{ .Release.Name }}
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/data-deployment.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/data-deployment.yaml
deleted file mode 100644
index 81a1e3b9..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/data-deployment.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: edgex-core-data
-    release: {{ .Release.Name }}
-  name: edgex-core-data
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: edgex-core-data
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: edgex-core-data
-        release: {{ .Release.Name }}
-    spec:
-      containers:
-      - image: edgexfoundry/docker-core-data:0.2.1
-        name: edgex-core-data
-        ports:
-        {{- range $key, $val := .Values.service.data.ports }}
-        - containerPort: {{ $val.port }}
-        {{- end }}
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-data
-      - name: edgex-logs
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-logs
-      - name: consul-config
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-config
-      - name: consul-data
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-data
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/data-service.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/data-service.yaml
deleted file mode 100644
index c7f68798..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/data-service.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: {{ .Values.service.data.name }}
-    release: {{ .Release.Name }}
-  name: {{ .Values.service.data.name }}
-spec:
-  ports:
-  {{- range $key, $val := .Values.service.data.ports }}
-  - name: {{ $val.portName }}
-    port: {{ $val.port }}
-    targetPort: {{ $val.port }}
-  {{- end }}
-  selector:
-    app: edgex-core-data
-    release: {{ .Release.Name }}
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/device-bluetooth-deployment.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/device-bluetooth-deployment.yaml
deleted file mode 100644
index 52ab77e8..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/device-bluetooth-deployment.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: edgex-device-bluetooth
-    release: {{ .Release.Name }}
-  name: edgex-device-bluetooth
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: edgex-device-bluetooth
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      creationTimestamp: null
-      labels:
-        app: edgex-device-bluetooth
-        release: {{ .Release.Name }}
-    spec:
-      containers:
-      - image: edgexfoundry/docker-device-bluetooth:0.2.1
-        name: edgex-device-bluetooth
-        ports:
-        - containerPort: {{ .Values.service.deviceBluetooth.port }}
-        resources: {}
-        securityContext:
-          privileged: true
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-data
-      - name: edgex-logs
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-logs
-      - name: consul-config
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-config
-      - name: consul-data
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-data
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/device-bluetooth-service.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/device-bluetooth-service.yaml
deleted file mode 100644
index dbbb1e39..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/device-bluetooth-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: {{ .Values.service.deviceBluetooth.name }}
-    release: {{ .Release.Name }}
-  name: {{ .Values.service.deviceBluetooth.name }}
-spec:
-  ports:
-  - name: {{ .Values.service.deviceBluetooth.portName }}
-    port: {{ .Values.service.deviceBluetooth.port }}
-    targetPort: {{ .Values.service.deviceBluetooth.port }}
-  selector:
-    app: edgex-device-bluetooth
-    release: {{ .Release.Name }}
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-client-deployment.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-client-deployment.yaml
deleted file mode 100644
index 0d60b419..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-client-deployment.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: edgex-export-client
-    release: {{ .Release.Name }}
-  name: edgex-export-client
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: edgex-export-client
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: edgex-export-client
-        release: {{ .Release.Name }}
-    spec:
-      containers:
-      - image: edgexfoundry/docker-export-client:0.2.1
-        name: edgex-export-client
-        ports:
-        - containerPort: {{ .Values.service.exportClient.port }}
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-data
-      - name: edgex-logs
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-logs
-      - name: consul-config
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-config
-      - name: consul-data
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-data
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-client-service.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-client-service.yaml
deleted file mode 100644
index ec44fd51..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-client-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: {{ .Values.service.exportClient.name }}
-    release: {{ .Release.Name }}
-  name:  {{ .Values.service.exportClient.name }}
-spec:
-  ports:
-  - name: {{ .Values.service.exportClient.portName }}
-    port: {{ .Values.service.exportClient.port }}
-    targetPort: {{ .Values.service.exportClient.port }}
-  selector:
-    app: edgex-export-client
-    release: {{ .Release.Name }}
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-distro-deployment.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-distro-deployment.yaml
deleted file mode 100644
index 4cf17dfe..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-distro-deployment.yaml
+++ /dev/null
@@ -1,50 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: edgex-export-distro
-    release: {{ .Release.Name }}
-  name: edgex-export-distro
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: edgex-export-distro
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: edgex-export-distro
-        release: {{ .Release.Name }}
-    spec:
-      containers:
-      - image: edgexfoundry/docker-export-distro:0.2.1
-        name: edgex-export-distro
-        ports:
-        {{- range $key, $val := .Values.service.exportDistro.ports }}
-        - containerPort: {{ $val.port }}
-        {{- end }}
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-data
-      - name: edgex-logs
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-logs
-      - name: consul-config
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-config
-      - name: consul-data
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-data
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-distro-service.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-distro-service.yaml
deleted file mode 100644
index 70624abf..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/export-distro-service.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: {{ .Values.service.exportDistro.name }}
-    release: {{ .Release.Name }}
-  name: {{ .Values.service.exportDistro.name }}
-spec:
-  ports:
-  {{- range $key, $val := .Values.service.exportDistro.ports }}
-  - name: {{ $val.portName }}
-    port: {{ $val.port }}
-    targetPort: {{ $val.port }}
-  {{- end }}
-  selector:
-    app: edgex-export-distro
-    release: {{ .Release.Name }}
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/logging-deployment.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/logging-deployment.yaml
deleted file mode 100644
index a60e26f1..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/logging-deployment.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: edgex-support-logging
-    release: {{ .Release.Name }}
-  name: edgex-support-logging
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: edgex-support-logging
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: edgex-support-logging
-        release: {{ .Release.Name }}
-    spec:
-      containers:
-      - image: edgexfoundry/docker-support-logging:0.2.1
-        name: edgex-support-logging
-        ports:
-        - containerPort: {{ .Values.service.logging.port }}
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-data
-      - name: edgex-logs
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-logs
-      - name: consul-config
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-config
-      - name: consul-data
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-data
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/logging-service.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/logging-service.yaml
deleted file mode 100644
index 32c85908..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/logging-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: {{ .Values.service.logging.name }}
-    release: {{ .Release.Name }}
-  name: {{ .Values.service.logging.name }}
-spec:
-  ports:
-  - name: {{ .Values.service.logging.portName }}
-    port: {{ .Values.service.logging.port }}
-    targetPort: {{ .Values.service.logging.port }}
-  selector:
-    app: edgex-support-logging
-    release: {{ .Release.Name }}
\ No newline at end of file
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/metadata-deployment.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/metadata-deployment.yaml
deleted file mode 100644
index 6ce913fa..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/metadata-deployment.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: edgex-core-metadata
-    release: {{ .Release.Name }}
-  name: edgex-core-metadata
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: edgex-core-metadata
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: edgex-core-metadata
-        release: {{ .Release.Name }}
-    spec:
-      containers:
-      - image: edgexfoundry/docker-core-metadata:0.2.1
-        name: edgex-core-metadata
-        ports:
-        - containerPort: {{ .Values.service.metadata.port }}
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-data
-      - name: edgex-logs
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-logs
-      - name: consul-config
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-config
-      - name: consul-data
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-data
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/metadata-service.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/metadata-service.yaml
deleted file mode 100644
index 8d03118f..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/metadata-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: {{ .Values.service.metadata.name }}
-    release: {{ .Release.Name }}
-  name: {{ .Values.service.metadata.name }}
-spec:
-  ports:
-  - name: {{ .Values.service.metadata.portName }}
-    port: {{ .Values.service.metadata.port }}
-    targetPort: {{ .Values.service.metadata.port }}
-  selector:
-    app: edgex-core-metadata
-    release: {{ .Release.Name }}
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/notifications-deployment.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/notifications-deployment.yaml
deleted file mode 100644
index d736d14a..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/notifications-deployment.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: edgex-support-notifications
-    release: {{ .Release.Name }}
-  name: edgex-support-notifications
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: edgex-support-notifications
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: edgex-support-notifications
-        release: {{ .Release.Name }}
-    spec:
-      containers:
-      - image: edgexfoundry/docker-support-notifications:0.2
-        name: edgex-support-notifications
-        ports:
-        - containerPort: {{ .Values.service.notifications.port }}
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-data
-      - name: edgex-logs
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-logs
-      - name: consul-config
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-config
-      - name: consul-data
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-data
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/notifications-service.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/notifications-service.yaml
deleted file mode 100644
index d9afefc5..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/notifications-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: {{ .Values.service.notifications.name }}
-    release: {{ .Release.Name }}
-  name: {{ .Values.service.notifications.name }}
-spec:
-  ports:
-  - name: {{ .Values.service.notifications.portName }}
-    port: {{ .Values.service.notifications.port }}
-    targetPort: {{ .Values.service.notifications.port }}
-  selector:
-    app: edgex-support-notifications
-    release: {{ .Release.Name }}
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/pv.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/pv.yaml
deleted file mode 100644
index aa07549d..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/pv.yaml
+++ /dev/null
@@ -1,99 +0,0 @@
-{{/*
-# Copyright 2018 Intel Corporation, Inc
-#
-# 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 .Values.persistence.enabled -}}
-
-kind: PersistentVolume
-apiVersion: v1
-metadata:
-  name: {{ printf "%s-%s" .Release.Name .Chart.Name }}-data
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ .Chart.Name }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    name: {{ printf "%s-%s" .Release.Name .Chart.Name }}-data
-spec:
-  accessModes:
-    - {{ .Values.persistence.accessMode }}
-  capacity:
-    storage: {{ .Values.persistence.size }}
-  persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }}
-  hostPath:
-    path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPathData }}
----
-kind: PersistentVolume
-apiVersion: v1
-metadata:
-  name: {{ printf "%s-%s" .Release.Name .Chart.Name }}-logs
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ .Chart.Name }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    name: {{ printf "%s-%s" .Release.Name .Chart.Name }}-logs
-spec:
-  accessModes:
-    - {{ .Values.persistence.accessMode }}
-  capacity:
-    storage: {{ .Values.persistence.size }}
-  persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }}
-  hostPath:
-    path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPathLogs }}
----
-kind: PersistentVolume
-apiVersion: v1
-metadata:
-  name: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-config
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ .Chart.Name }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    name: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-config
-spec:
-  accessModes:
-    - {{ .Values.persistence.accessMode }}
-  capacity:
-    storage: {{ .Values.persistence.size }}
-  persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }}
-  hostPath:
-    path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPathConsulConf }}
----
-kind: PersistentVolume
-apiVersion: v1
-metadata:
-  name: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-data
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ .Chart.Name }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-    name: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-data
-spec:
-  accessModes:
-    - {{ .Values.persistence.accessMode }}
-  capacity:
-    storage: {{ .Values.persistence.size }}
-  persistentVolumeReclaimPolicy: {{ .Values.persistence.volumeReclaimPolicy }}
-  hostPath:
-    path: {{ .Values.global.persistence.mountPath | default .Values.persistence.mountPath }}/{{ .Release.Name }}/{{ .Values.persistence.mountSubPathConsulData }}
-
-{{- end -}}
\ No newline at end of file
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/pvc.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/pvc.yaml
deleted file mode 100644
index 7c31733e..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/pvc.yaml
+++ /dev/null
@@ -1,143 +0,0 @@
-{{/*
-# Copyright 2018 Intel Corporation, Inc
-#
-# 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 .Values.persistence.enabled -}}
-
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ printf "%s-%s" .Release.Name .Chart.Name }}-data
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ .Chart.Name }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-{{- if .Values.persistence.annotations }}
-  annotations:
-{{ toYaml .Values.persistence.annotations | indent 4 }}
-{{- end }}
-spec:
-  selector:
-    matchLabels:
-      name: {{ printf "%s-%s" .Release.Name .Chart.Name }}-data
-  accessModes:
-    - {{ .Values.persistence.accessMode }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.size }}
-{{- if .Values.persistence.storageClass }}
-{{- if (eq "-" .Values.persistence.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.storageClass }}"
-{{- end }}
-{{- end }}
----
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ printf "%s-%s" .Release.Name .Chart.Name }}-logs
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ .Chart.Name }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-{{- if .Values.persistence.annotations }}
-  annotations:
-{{ toYaml .Values.persistence.annotations | indent 4 }}
-{{- end }}
-spec:
-  selector:
-    matchLabels:
-      name: {{ printf "%s-%s" .Release.Name .Chart.Name }}-logs
-  accessModes:
-    - {{ .Values.persistence.accessMode }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.size }}
-{{- if .Values.persistence.storageClass }}
-{{- if (eq "-" .Values.persistence.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.storageClass }}"
-{{- end }}
-{{- end }}
----
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-config
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ .Chart.Name }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-{{- if .Values.persistence.annotations }}
-  annotations:
-{{ toYaml .Values.persistence.annotations | indent 4 }}
-{{- end }}
-spec:
-  selector:
-    matchLabels:
-      name: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-config
-  accessModes:
-    - {{ .Values.persistence.accessMode }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.size }}
-{{- if .Values.persistence.storageClass }}
-{{- if (eq "-" .Values.persistence.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.storageClass }}"
-{{- end }}
-{{- end }}
----
-kind: PersistentVolumeClaim
-apiVersion: v1
-metadata:
-  name: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-data
-  namespace: {{ .Release.Namespace }}
-  labels:
-    app: {{ .Chart.Name }}
-    chart: "{{ .Chart.Name }}-{{ .Chart.Version }}"
-    release: "{{ .Release.Name }}"
-    heritage: "{{ .Release.Service }}"
-{{- if .Values.persistence.annotations }}
-  annotations:
-{{ toYaml .Values.persistence.annotations | indent 4 }}
-{{- end }}
-spec:
-  selector:
-    matchLabels:
-      name: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-data
-  accessModes:
-    - {{ .Values.persistence.accessMode }}
-  resources:
-    requests:
-      storage: {{ .Values.persistence.size }}
-{{- if .Values.persistence.storageClass }}
-{{- if (eq "-" .Values.persistence.storageClass) }}
-  storageClassName: ""
-{{- else }}
-  storageClassName: "{{ .Values.persistence.storageClass }}"
-{{- end }}
-{{- end }}
-
-{{- end -}}
\ No newline at end of file
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/rulesengine-deployment.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/rulesengine-deployment.yaml
deleted file mode 100644
index 0f3e1384..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/rulesengine-deployment.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: edgex-support-rulesengine
-    release: {{ .Release.Name }}
-  name: edgex-support-rulesengine
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: edgex-support-rulesengine
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: edgex-support-rulesengine
-        release: {{ .Release.Name }}
-    spec:
-      containers:
-      - image: edgexfoundry/docker-support-rulesengine:0.2.1
-        name: edgex-support-rulesengine
-        ports:
-        - containerPort: {{ .Values.service.rulesengine.port }}
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-data
-      - name: edgex-logs
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-logs
-      - name: consul-config
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-config
-      - name: consul-data
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-data
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/rulesengine-service.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/rulesengine-service.yaml
deleted file mode 100644
index 756ad423..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/rulesengine-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: {{ .Values.service.rulesengine.name }}
-    release: {{ .Release.Name }}
-  name: {{ .Values.service.rulesengine.name }}
-spec:
-  ports:
-  - name: {{ .Values.service.rulesengine.portName }}
-    port: {{ .Values.service.rulesengine.port }}
-    targetPort: {{ .Values.service.rulesengine.port }}
-  selector:
-    app: edgex-support-rulesengine
-    release: {{ .Release.Name }}
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/scheduler-deployment.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/scheduler-deployment.yaml
deleted file mode 100644
index 1bff0521..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/scheduler-deployment.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    app: edgex-support-scheduler
-    release: {{ .Release.Name }}
-  name: edgex-support-scheduler
-spec:
-  replicas: 1
-  selector:
-    matchLabels:
-      app: edgex-support-scheduler
-      release: {{ .Release.Name }}
-  template:
-    metadata:
-      labels:
-        app: edgex-support-scheduler
-        release: {{ .Release.Name }}
-    spec:
-      containers:
-      - image: edgexfoundry/docker-support-scheduler:0.2.1
-        name: edgex-support-scheduler
-        ports:
-        - containerPort: {{ .Values.service.scheduler.port }}
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-data
-      - name: edgex-logs
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-logs
-      - name: consul-config
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-config
-      - name: consul-data
-        persistentVolumeClaim:
-          claimName: {{ printf "%s-%s" .Release.Name .Chart.Name }}-consul-data
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/templates/scheduler-service.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/templates/scheduler-service.yaml
deleted file mode 100644
index a5311829..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/templates/scheduler-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    app: {{ .Values.service.scheduler.name }}
-    release: {{ .Release.Name }}
-  name: {{ .Values.service.scheduler.name }}
-spec:
-  ports:
-  - name: {{ .Values.service.scheduler.portName }}
-    port: {{ .Values.service.scheduler.port }}
-    targetPort: {{ .Values.service.scheduler.port }}
-  selector:
-    app: edgex-support-scheduler
-    release: {{ .Release.Name }}
diff --git a/vagrant/tests/vnfs/edgex/helm/edgex/values.yaml b/vagrant/tests/vnfs/edgex/helm/edgex/values.yaml
deleted file mode 100644
index 90a0068d..00000000
--- a/vagrant/tests/vnfs/edgex/helm/edgex/values.yaml
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2018 Intel Corporation, Inc
-#
-# 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:
-  persistence: {}
-#################################################################
-# Application configuration defaults.
-#################################################################
-
-# flag to enable debugging - application support required
-debugEnabled: false
-
-# default number of instances
-replicaCount: 1
-
-nodeSelector: {}
-
-affinity: {}
-
-# probe configuration parameters
-liveness:
-  initialDelaySeconds: 10
-  periodSeconds: 30
-  # necessary to disable liveness probe when setting breakpoints
-  # in debugger so K8s doesn't restart unresponsive container
-  enabled: true
-
-readiness:
-  initialDelaySeconds: 10
-  periodSeconds: 30
-
-service:
-  command:
-    name: edgex-core-command
-    portName: core-command
-    port: 48082
-  data:
-    name: edgex-core-data
-    ports:
-    - portName: data-port-1
-      port: 48080
-    - portName: data-port-2
-      port: 5563
-  deviceBluetooth:
-    name: edgex-device-bluetooth
-    portName: device-bluetooth
-    port: 49988
-  exportClient:
-    name: edgex-export-client
-    portName: export-client
-    port: 48071
-  exportDistro:
-    name: edgex-export-distro
-    ports:
-    - portName: export-distro-port1
-      port: 48070
-    - portName: export-distro-port2
-      port: 5566
-  logging:
-    name: edgex-support-logging
-    portName: logging
-    port: 48061
-  metadata:
-    name: edgex-core-metadata
-    portName: metadata
-    port: 48081
-  notifications:
-    name: edgex-support-notifications
-    portName: notifications
-    port: 48060
-  rulesengine:
-    name: edgex-support-rulesengine
-    portName: rulesengine
-    port: 48075
-  scheduler:
-    name: edgex-support-scheduler
-    portName: scheduler
-    port: 48085
-
-persistence:
-  enabled: true
-  volumeReclaimPolicy: Retain
-  accessMode: ReadWriteOnce
-  size: 1Gi
-  mountPath: /dockerdata-nfs
-  mountSubPathData: vnfs/edgex/data/db
-  mountSubPathLogs: vnfs/edgex/logs
-  mountSubPathConsulConf: vnfs/edgex/consul/config
-  mountSubPathConsulData: vnfs/edgex/consul/data
-
-ingress:
-  enabled: false
-
-# Configure resource requests and limits
-flavor: small
-resources:
-  small:
-    limits:
-      cpu: 200m
-      memory: 500Mi
-    requests:
-      cpu: 10m
-      memory: 10Mi
-  large:
-    limits:
-      cpu: 400m
-      memory: 1Gi
-    requests:
-      cpu: 10m
-      memory: 100Mi
-  unlimited: {}
\ No newline at end of file
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/command-deployment.yaml b/vagrant/tests/vnfs/edgex/kubernetes/deployments/command-deployment.yaml
deleted file mode 100644
index ba4e3c12..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/command-deployment.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    io.kompose.service: edgex-core-command
-  name: edgex-core-command
-spec:
-  selector:
-    matchLabels:
-      io.kompose.service: edgex-core-command
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        io.kompose.service: edgex-core-command
-    spec:
-      containers:
-      - image: edgexfoundry/docker-core-command:0.2.1
-        name: edgex-core-command
-        ports:
-        - containerPort: 48082
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        hostPath:
-          path: /data/db
-      - name: edgex-logs
-        hostPath:
-          path: /edgex/logs
-      - name: consul-config
-        hostPath:
-          path: /consul/config
-      - name: consul-data
-        hostPath:
-          path: /consul/data
-status: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/consul-deployment.yaml b/vagrant/tests/vnfs/edgex/kubernetes/deployments/consul-deployment.yaml
deleted file mode 100644
index 157a2130..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/consul-deployment.yaml
+++ /dev/null
@@ -1,48 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    io.kompose.service: edgex-core-consul
-  name: edgex-core-consul
-spec:
-  selector:
-      matchLabels:
-        io.kompose.service: edgex-core-consul
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        io.kompose.service: edgex-core-consul
-    spec:
-      containers:
-      - image: edgexfoundry/docker-core-consul:latest
-        name: edgex-core-consul
-        ports:
-        - containerPort: 8400
-        - containerPort: 8500
-        - containerPort: 8600
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        hostPath:
-          path: /data/db
-      - name: edgex-logs
-        hostPath:
-          path: /edgex/logs
-      - name: consul-config
-        hostPath:
-          path: /consul/config
-      - name: consul-data
-        hostPath:
-          path: /consul/data
-status: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/data-deployment.yaml b/vagrant/tests/vnfs/edgex/kubernetes/deployments/data-deployment.yaml
deleted file mode 100644
index 64d28a4c..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/data-deployment.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    io.kompose.service: edgex-core-data
-  name: edgex-core-data
-spec:
-  selector:
-      matchLabels:
-        io.kompose.service: edgex-core-data
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        io.kompose.service: edgex-core-data
-    spec:
-      containers:
-      - image: edgexfoundry/docker-core-data:0.2.1
-        name: edgex-core-data
-        ports:
-        - containerPort: 48080
-        - containerPort: 5563
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        hostPath:
-          path: /data/db
-      - name: edgex-logs
-        hostPath:
-          path: /edgex/logs
-      - name: consul-config
-        hostPath:
-          path: /consul/config
-      - name: consul-data
-        hostPath:
-          path: /consul/data
-status: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/device-bluetooth-deployment.yaml b/vagrant/tests/vnfs/edgex/kubernetes/deployments/device-bluetooth-deployment.yaml
deleted file mode 100644
index 9dc96785..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/device-bluetooth-deployment.yaml
+++ /dev/null
@@ -1,49 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    io.kompose.service: edgex-device-bluetooth
-  name: edgex-device-bluetooth
-spec:
-  selector:
-      matchLabels:
-        io.kompose.service: edgex-device-bluetooth
-  replicas: 1
-  template:
-    metadata:
-      creationTimestamp: null
-      labels:
-        io.kompose.service: edgex-device-bluetooth
-    spec:
-      containers:
-      - image: edgexfoundry/docker-device-bluetooth:0.2.1
-        name: edgex-device-bluetooth
-        ports:
-        - containerPort: 49988
-        resources: {}
-        securityContext:
-          privileged: true
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        hostPath:
-          path: /data/db
-      - name: edgex-logs
-        hostPath:
-          path: /edgex/logs
-      - name: consul-config
-        hostPath:
-          path: /consul/config
-      - name: consul-data
-        hostPath:
-          path: /consul/data
-status: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/export-client-deployment.yaml b/vagrant/tests/vnfs/edgex/kubernetes/deployments/export-client-deployment.yaml
deleted file mode 100644
index 191abc4f..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/export-client-deployment.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    io.kompose.service: edgex-export-client
-  name: edgex-export-client
-spec:
-  selector:
-    matchLabels:
-      io.kompose.service: edgex-export-client
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        io.kompose.service: edgex-export-client
-    spec:
-      containers:
-      - image: edgexfoundry/docker-export-client:0.2.1
-        name: edgex-export-client
-        ports:
-        - containerPort: 48071
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        hostPath:
-          path: /data/db
-      - name: edgex-logs
-        hostPath:
-          path: /edgex/logs
-      - name: consul-config
-        hostPath:
-          path: /consul/config
-      - name: consul-data
-        hostPath:
-          path: /consul/data
-status: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/export-distro-deployment.yaml b/vagrant/tests/vnfs/edgex/kubernetes/deployments/export-distro-deployment.yaml
deleted file mode 100644
index ff0d880e..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/export-distro-deployment.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    io.kompose.service: edgex-export-distro
-  name: edgex-export-distro
-spec:
-  selector:
-    matchLabels:
-      io.kompose.service: edgex-export-distro
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        io.kompose.service: edgex-export-distro
-    spec:
-      containers:
-      - image: edgexfoundry/docker-export-distro:0.2.1
-        name: edgex-export-distro
-        ports:
-        - containerPort: 48070
-        - containerPort: 5566
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        hostPath:
-          path: /data/db
-      - name: edgex-logs
-        hostPath:
-          path: /edgex/logs
-      - name: consul-config
-        hostPath:
-          path: /consul/config
-      - name: consul-data
-        hostPath:
-          path: /consul/data
-status: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/logging-deployment.yaml b/vagrant/tests/vnfs/edgex/kubernetes/deployments/logging-deployment.yaml
deleted file mode 100644
index a52085bc..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/logging-deployment.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    io.kompose.service: edgex-support-logging
-  name: edgex-support-logging
-spec:
-  selector:
-    matchLabels:
-      io.kompose.service: edgex-support-logging
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        io.kompose.service: edgex-support-logging
-    spec:
-      containers:
-      - image: edgexfoundry/docker-support-logging:0.2.1
-        name: edgex-support-logging
-        ports:
-        - containerPort: 48061
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        hostPath:
-          path: /data/db
-      - name: edgex-logs
-        hostPath:
-          path: /edgex/logs
-      - name: consul-config
-        hostPath:
-          path: /consul/config
-      - name: consul-data
-        hostPath:
-          path: /consul/data
-status: {}
-
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/metadata-deployment.yaml b/vagrant/tests/vnfs/edgex/kubernetes/deployments/metadata-deployment.yaml
deleted file mode 100644
index 44eb8114..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/metadata-deployment.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    io.kompose.service: edgex-core-metadata
-  name: edgex-core-metadata
-spec:
-  selector:
-    matchLabels:
-      io.kompose.service: edgex-core-metadata
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        io.kompose.service: edgex-core-metadata
-    spec:
-      containers:
-      - image: edgexfoundry/docker-core-metadata:0.2.1
-        name: edgex-core-metadata
-        ports:
-        - containerPort: 48081
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        hostPath:
-          path: /data/db
-      - name: edgex-logs
-        hostPath:
-          path: /edgex/logs
-      - name: consul-config
-        hostPath:
-          path: /consul/config
-      - name: consul-data
-        hostPath:
-          path: /consul/data
-status: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/mongo-deployment.yaml b/vagrant/tests/vnfs/edgex/kubernetes/deployments/mongo-deployment.yaml
deleted file mode 100644
index 26df5f02..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/mongo-deployment.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    io.kompose.service: edgex-mongo
-  name: edgex-mongo
-spec:
-  selector:
-      matchLabels:
-        io.kompose.service: edgex-mongo
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        io.kompose.service: edgex-mongo
-    spec:
-      containers:
-      - image: edgexfoundry/docker-edgex-mongo:0.2
-        name: edgex-mongo
-        ports:
-        - containerPort: 27017
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        hostPath:
-          path: /data/db
-      - name: edgex-logs
-        hostPath:
-          path: /edgex/logs
-      - name: consul-config
-        hostPath:
-          path: /consul/config
-      - name: consul-data
-        hostPath:
-          path: /consul/data
-status: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/notifications-deployment.yaml b/vagrant/tests/vnfs/edgex/kubernetes/deployments/notifications-deployment.yaml
deleted file mode 100644
index 447789e3..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/notifications-deployment.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    io.kompose.service: edgex-support-notifications
-  name: edgex-support-notifications
-spec:
-  selector:
-    matchLabels:
-      io.kompose.service: edgex-support-notifications
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        io.kompose.service: edgex-support-notifications
-    spec:
-      containers:
-      - image: edgexfoundry/docker-support-notifications:0.2
-        name: edgex-support-notifications
-        ports:
-        - containerPort: 48060
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        hostPath:
-          path: /data/db
-      - name: edgex-logs
-        hostPath:
-          path: /edgex/logs
-      - name: consul-config
-        hostPath:
-          path: /consul/config
-      - name: consul-data
-        hostPath:
-          path: /consul/data
-status: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/rulesengine-deployment.yaml b/vagrant/tests/vnfs/edgex/kubernetes/deployments/rulesengine-deployment.yaml
deleted file mode 100644
index 1d49b67a..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/rulesengine-deployment.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    io.kompose.service: edgex-support-rulesengine
-  name: rulesengine
-spec:
-  selector:
-    matchLabels:
-      io.kompose.service: edgex-support-rulesengine
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        io.kompose.service: edgex-support-rulesengine
-    spec:
-      containers:
-      - image: edgexfoundry/docker-support-rulesengine:0.2.1
-        name: edgex-support-rulesengine
-        ports:
-        - containerPort: 48075
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        hostPath:
-          path: /data/db
-      - name: edgex-logs
-        hostPath:
-          path: /edgex/logs
-      - name: consul-config
-        hostPath:
-          path: /consul/config
-      - name: consul-data
-        hostPath:
-          path: /consul/data
-status: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/deployments/scheduler-deployment.yaml b/vagrant/tests/vnfs/edgex/kubernetes/deployments/scheduler-deployment.yaml
deleted file mode 100644
index 94e4226b..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/deployments/scheduler-deployment.yaml
+++ /dev/null
@@ -1,46 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  labels:
-    io.kompose.service: edgex-support-scheduler
-  name: edgex-support-scheduler
-spec:
-  selector:
-    matchLabels:
-      io.kompose.service: edgex-support-scheduler
-  replicas: 1
-  template:
-    metadata:
-      labels:
-        io.kompose.service: edgex-support-scheduler
-    spec:
-      containers:
-      - image: edgexfoundry/docker-support-scheduler:0.2.1
-        name: edgex-support-scheduler
-        ports:
-        - containerPort: 48085
-        resources: {}
-        volumeMounts:
-        - mountPath: /data/db
-          name: data-db
-        - mountPath: /edgex/logs
-          name: edgex-logs
-        - mountPath: /consul/config
-          name: consul-config
-        - mountPath: /consul/data
-          name: consul-data
-      restartPolicy: Always
-      volumes:
-      - name: data-db
-        hostPath:
-          path: /data/db
-      - name: edgex-logs
-        hostPath:
-          path: /edgex/logs
-      - name: consul-config
-        hostPath:
-          path: /consul/config
-      - name: consul-data
-        hostPath:
-          path: /consul/data
-status: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/metadata.yaml b/vagrant/tests/vnfs/edgex/kubernetes/metadata.yaml
deleted file mode 100644
index 63f784dc..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/metadata.yaml
+++ /dev/null
@@ -1,27 +0,0 @@
-resources:
-  deployment:
-    - deployments/command-deployment.yaml
-    - deployments/consul-deployment.yaml
-    - deployments/data-deployment.yaml
-    - deployments/device-bluetooth-deployment.yaml
-    - deployments/export-client-deployment.yaml
-    - deployments/export-distro-deployment.yaml
-    - deployments/logging-deployment.yaml
-    - deployments/metadata-deployment.yaml
-    - deployments/mongo-deployment.yaml
-    - deployments/notifications-deployment.yaml
-    - deployments/rulesengine-deployment.yaml
-    - deployments/scheduler-deployment.yaml
-  service:
-    - services/command-service.yaml
-    - services/consul-service.yaml
-    - services/data-service.yaml
-    - services/device-bluetooth-service.yaml
-    - services/export-client-service.yaml
-    - services/export-distro-service.yaml
-    - services/logging-service.yaml
-    - services/metadata-service.yaml
-    - services/mongo-service.yaml
-    - services/notifications-service.yaml
-    - services/rulesengine-service.yaml
-    - services/scheduler-service.yaml
\ No newline at end of file
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/command-service.yaml b/vagrant/tests/vnfs/edgex/kubernetes/services/command-service.yaml
deleted file mode 100644
index f8d7d745..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/command-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    io.kompose.service: edgex-core-command
-  name: edgex-core-command
-spec:
-  ports:
-  - name: "48082"
-    port: 48082
-    targetPort: 48082
-  selector:
-    io.kompose.service: edgex-core-command
-status:
-  loadBalancer: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/consul-service.yaml b/vagrant/tests/vnfs/edgex/kubernetes/services/consul-service.yaml
deleted file mode 100644
index 7b5c6ddc..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/consul-service.yaml
+++ /dev/null
@@ -1,21 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    io.kompose.service: edgex-core-consul
-  name: edgex-core-consul
-spec:
-  ports:
-  - name: "8400"
-    port: 8400
-    targetPort: 8400
-  - name: "8500"
-    port: 8500
-    targetPort: 8500
-  - name: "8600"
-    port: 8600
-    targetPort: 8600
-  selector:
-    io.kompose.service: edgex-core-consul
-status:
-  loadBalancer: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/data-service.yaml b/vagrant/tests/vnfs/edgex/kubernetes/services/data-service.yaml
deleted file mode 100644
index fc6e5566..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/data-service.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    io.kompose.service: edgex-core-data
-  name: edgex-core-data
-spec:
-  ports:
-  - name: "48080"
-    port: 48080
-    targetPort: 48080
-  - name: "5563"
-    port: 5563
-    targetPort: 5563
-  selector:
-    io.kompose.service: edgex-core-data
-status:
-  loadBalancer: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/device-bluetooth-service.yaml b/vagrant/tests/vnfs/edgex/kubernetes/services/device-bluetooth-service.yaml
deleted file mode 100644
index 48ffc9ef..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/device-bluetooth-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    io.kompose.service: edgex-device-bluetooth
-  name: edgex-device-bluetooth
-spec:
-  ports:
-  - name: "49988"
-    port: 49988
-    targetPort: 49988
-  selector:
-    io.kompose.service: edgex-device-bluetooth
-status:
-  loadBalancer: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/export-client-service.yaml b/vagrant/tests/vnfs/edgex/kubernetes/services/export-client-service.yaml
deleted file mode 100644
index 709953cd..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/export-client-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    io.kompose.service: edgex-export-client
-  name:  edgex-export-client
-spec:
-  ports:
-  - name: "48071"
-    port: 48071
-    targetPort: 48071
-  selector:
-    io.kompose.service: edgex-export-client
-status:
-  loadBalancer: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/export-distro-service.yaml b/vagrant/tests/vnfs/edgex/kubernetes/services/export-distro-service.yaml
deleted file mode 100644
index 19d6bf5e..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/export-distro-service.yaml
+++ /dev/null
@@ -1,18 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    io.kompose.service: edgex-export-distro
-  name: edgex-export-distro
-spec:
-  ports:
-  - name: "48070"
-    port: 48070
-    targetPort: 48070
-  - name: "5566"
-    port: 5566
-    targetPort: 5566
-  selector:
-    io.kompose.service: edgex-export-distro
-status:
-  loadBalancer: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/logging-service.yaml b/vagrant/tests/vnfs/edgex/kubernetes/services/logging-service.yaml
deleted file mode 100644
index a25d9a9e..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/logging-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    io.kompose.service: edgex-support-logging
-  name: edgex-support-logging
-spec:
-  ports:
-  - name: "48061"
-    port: 48061
-    targetPort: 48061
-  selector:
-    io.kompose.service: edgex-support-logging
-status:
-  loadBalancer: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/metadata-service.yaml b/vagrant/tests/vnfs/edgex/kubernetes/services/metadata-service.yaml
deleted file mode 100644
index 12f76836..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/metadata-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    io.kompose.service: edgex-core-metadata
-  name: edgex-core-metadata
-spec:
-  ports:
-  - name: "48081"
-    port: 48081
-    targetPort: 48081
-  selector:
-    io.kompose.service: edgex-core-metadata
-status:
-  loadBalancer: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/mongo-service.yaml b/vagrant/tests/vnfs/edgex/kubernetes/services/mongo-service.yaml
deleted file mode 100644
index 0c919b79..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/mongo-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    io.kompose.service: edgex-mongo
-  name: edgex-mongo
-spec:
-  ports:
-  - name: "27017"
-    port: 27017
-    targetPort: 27017
-  selector:
-    io.kompose.service: edgex-mongo
-status:
-  loadBalancer: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/notifications-service.yaml b/vagrant/tests/vnfs/edgex/kubernetes/services/notifications-service.yaml
deleted file mode 100644
index 3245282b..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/notifications-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    io.kompose.service: edgex-support-notifications
-  name: edgex-support-notifications
-spec:
-  ports:
-  - name: "48060"
-    port: 48060
-    targetPort: 48060
-  selector:
-    io.kompose.service: edgex-support-notifications
-status:
-  loadBalancer: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/rulesengine-service.yaml b/vagrant/tests/vnfs/edgex/kubernetes/services/rulesengine-service.yaml
deleted file mode 100644
index 238c32ce..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/rulesengine-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    io.kompose.service: edgex-support-rulesengine
-  name: edgex-support-rulesengine
-spec:
-  ports:
-  - name: "48075"
-    port: 48075
-    targetPort: 48075
-  selector:
-    io.kompose.service: edgex-support-rulesengine
-status:
-  loadBalancer: {}
diff --git a/vagrant/tests/vnfs/edgex/kubernetes/services/scheduler-service.yaml b/vagrant/tests/vnfs/edgex/kubernetes/services/scheduler-service.yaml
deleted file mode 100644
index 03ac0818..00000000
--- a/vagrant/tests/vnfs/edgex/kubernetes/services/scheduler-service.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-apiVersion: v1
-kind: Service
-metadata:
-  labels:
-    io.kompose.service: edgex-support-scheduler
-  name: edgex-support-scheduler
-spec:
-  ports:
-  - name: "48085"
-    port: 48085
-    targetPort: 48085
-  selector:
-    io.kompose.service: edgex-support-scheduler
-status:
-  loadBalancer: {}