101 files changed, 112 insertions, 1 deletions
diff --git a/deployments/helm/v2/onap4k8s/.helmignore b/deployments/helm/v2/emco/.helmignore
index 50af0317..50af0317 100644
--- a/deployments/helm/v2/onap4k8s/.helmignore
+++ b/deployments/helm/v2/emco/.helmignore
diff --git a/deployments/helm/v2/onap4k8s/Chart.yaml b/deployments/helm/v2/emco/Chart.yaml
index 6998dcaa..6998dcaa 100644
--- a/deployments/helm/v2/onap4k8s/Chart.yaml
+++ b/deployments/helm/v2/emco/Chart.yaml
diff --git a/deployments/helm/v2/onap4k8s/Makefile b/deployments/helm/v2/emco/Makefile
index dc88ff86..dc88ff86 100644
--- a/deployments/helm/v2/onap4k8s/Makefile
+++ b/deployments/helm/v2/emco/Makefile
diff --git a/deployments/helm/v2/onap4k8s/README.md b/deployments/helm/v2/emco/README.md
index 3534f5a5..3534f5a5 100644
--- a/deployments/helm/v2/onap4k8s/README.md
+++ b/deployments/helm/v2/emco/README.md
diff --git a/deployments/helm/v2/onap4k8s/clm/Chart.yaml b/deployments/helm/v2/emco/clm/Chart.yaml
index 00520a5f..00520a5f 100644
--- a/deployments/helm/v2/onap4k8s/clm/Chart.yaml
+++ b/deployments/helm/v2/emco/clm/Chart.yaml
diff --git a/deployments/helm/v2/onap4k8s/clm/requirements.yaml b/deployments/helm/v2/emco/clm/requirements.yaml
index c2253cf4..c2253cf4 100644
--- a/deployments/helm/v2/onap4k8s/clm/requirements.yaml
+++ b/deployments/helm/v2/emco/clm/requirements.yaml
diff --git a/deployments/helm/v2/onap4k8s/clm/resources/config/config.json b/deployments/helm/v2/emco/clm/resources/config/config.json
index 11d22f66..11d22f66 100644
--- a/deployments/helm/v2/onap4k8s/clm/resources/config/config.json
+++ b/deployments/helm/v2/emco/clm/resources/config/config.json
diff --git a/deployments/helm/v2/onap4k8s/clm/templates/configmap.yaml b/deployments/helm/v2/emco/clm/templates/configmap.yaml
index c9d55fed..c9d55fed 100644
--- a/deployments/helm/v2/onap4k8s/clm/templates/configmap.yaml
+++ b/deployments/helm/v2/emco/clm/templates/configmap.yaml
diff --git a/deployments/helm/v2/onap4k8s/clm/templates/deployment.yaml b/deployments/helm/v2/emco/clm/templates/deployment.yaml
index dea9f79c..dea9f79c 100644
--- a/deployments/helm/v2/onap4k8s/clm/templates/deployment.yaml
+++ b/deployments/helm/v2/emco/clm/templates/deployment.yaml
diff --git a/deployments/helm/v2/onap4k8s/clm/templates/service.yaml b/deployments/helm/v2/emco/clm/templates/service.yaml
index c9ab68d3..c9ab68d3 100644
--- a/deployments/helm/v2/onap4k8s/clm/templates/service.yaml
+++ b/deployments/helm/v2/emco/clm/templates/service.yaml
diff --git a/deployments/helm/v2/onap4k8s/clm/values.yaml b/deployments/helm/v2/emco/clm/values.yaml
index 156449e4..156449e4 100644
--- a/deployments/helm/v2/onap4k8s/clm/values.yaml
+++ b/deployments/helm/v2/emco/clm/values.yaml
diff --git a/deployments/helm/v2/onap4k8s/common/Chart.yaml b/deployments/helm/v2/emco/common/Chart.yaml
index 34ba55d1..34ba55d1 100644
--- a/deployments/helm/v2/onap4k8s/common/Chart.yaml
+++ b/deployments/helm/v2/emco/common/Chart.yaml
diff --git a/deployments/helm/v2/onap4k8s/common/templates/_deployment.tpl b/deployments/helm/v2/emco/common/templates/_deployment.tpl
index defc55c4..defc55c4 100644
--- a/deployments/helm/v2/onap4k8s/common/templates/_deployment.tpl
+++ b/deployments/helm/v2/emco/common/templates/_deployment.tpl
diff --git a/deployments/helm/v2/onap4k8s/common/templates/_name.tpl b/deployments/helm/v2/emco/common/templates/_name.tpl
index 42999846..42999846 100644
--- a/deployments/helm/v2/onap4k8s/common/templates/_name.tpl
+++ b/deployments/helm/v2/emco/common/templates/_name.tpl
diff --git a/deployments/helm/v2/onap4k8s/common/templates/_namespace.tpl b/deployments/helm/v2/emco/common/templates/_namespace.tpl
index 94c9ee72..94c9ee72 100644
--- a/deployments/helm/v2/onap4k8s/common/templates/_namespace.tpl
+++ b/deployments/helm/v2/emco/common/templates/_namespace.tpl
diff --git a/deployments/helm/v2/onap4k8s/common/templates/_repository.tpl b/deployments/helm/v2/emco/common/templates/_repository.tpl
index 272db421..272db421 100644
--- a/deployments/helm/v2/onap4k8s/common/templates/_repository.tpl
+++ b/deployments/helm/v2/emco/common/templates/_repository.tpl
diff --git a/deployments/helm/v2/onap4k8s/common/templates/_resources.tpl b/deployments/helm/v2/emco/common/templates/_resources.tpl
index fae77435..fae77435 100644
--- a/deployments/helm/v2/onap4k8s/common/templates/_resources.tpl
+++ b/deployments/helm/v2/emco/common/templates/_resources.tpl
diff --git a/deployments/helm/v2/onap4k8s/common/templates/_service.tpl b/deployments/helm/v2/emco/common/templates/_service.tpl
index 77b77d05..77b77d05 100644
--- a/deployments/helm/v2/onap4k8s/common/templates/_service.tpl
+++ b/deployments/helm/v2/emco/common/templates/_service.tpl
diff --git a/deployments/helm/v2/onap4k8s/common/templates/_servicemco.tpl b/deployments/helm/v2/emco/common/templates/_servicemco.tpl
index d791abba..d791abba 100644
--- a/deployments/helm/v2/onap4k8s/common/templates/_servicemco.tpl
+++ b/deployments/helm/v2/emco/common/templates/_servicemco.tpl
diff --git a/deployments/helm/v2/onap4k8s/common/values.yaml b/deployments/helm/v2/emco/common/values.yaml
index 852f15c8..852f15c8 100644
--- a/deployments/helm/v2/onap4k8s/common/values.yaml
+++ b/deployments/helm/v2/emco/common/values.yaml
diff --git a/deployments/helm/v2/onap4k8s/emco-db/Chart.yaml b/deployments/helm/v2/emco/emco-db/Chart.yaml
index ad67c3e2..ad67c3e2 100644
--- a/deployments/helm/v2/onap4k8s/emco-db/Chart.yaml
+++ b/deployments/helm/v2/emco/emco-db/Chart.yaml
diff --git a/deployments/helm/v2/onap4k8s/emco-db/requirements.yaml b/deployments/helm/v2/emco/emco-db/requirements.yaml
index 52a40b64..52a40b64 100644
--- a/deployments/helm/v2/onap4k8s/emco-db/requirements.yaml
+++ b/deployments/helm/v2/emco/emco-db/requirements.yaml
diff --git a/deployments/helm/v2/onap4k8s/emco-db/values.yaml b/deployments/helm/v2/emco/emco-db/values.yaml
index 359d73bc..359d73bc 100644
--- a/deployments/helm/v2/onap4k8s/emco-db/values.yaml
+++ b/deployments/helm/v2/emco/emco-db/values.yaml
diff --git a/deployments/helm/v2/onap4k8s/emco-services/Chart.yaml b/deployments/helm/v2/emco/emco-services/Chart.yaml
index a1a3808c..a1a3808c 100644
--- a/deployments/helm/v2/onap4k8s/emco-services/Chart.yaml
+++ b/deployments/helm/v2/emco/emco-services/Chart.yaml
diff --git a/deployments/helm/v2/onap4k8s/emco-services/requirements.yaml b/deployments/helm/v2/emco/emco-services/requirements.yaml
index 9cd7b475..9cd7b475 100644
--- a/deployments/helm/v2/onap4k8s/emco-services/requirements.yaml
+++ b/deployments/helm/v2/emco/emco-services/requirements.yaml
diff --git a/deployments/helm/v2/onap4k8s/emco-services/values.yaml b/deployments/helm/v2/emco/emco-services/values.yaml
index 359d73bc..359d73bc 100644
--- a/deployments/helm/v2/onap4k8s/emco-services/values.yaml
+++ b/deployments/helm/v2/emco/emco-services/values.yaml
diff --git a/deployments/helm/v2/onap4k8s/emco-tools/Chart.yaml b/deployments/helm/v2/emco/emco-tools/Chart.yaml
index 576f55f4..576f55f4 100644
--- a/deployments/helm/v2/onap4k8s/emco-tools/Chart.yaml
+++ b/deployments/helm/v2/emco/emco-tools/Chart.yaml
diff --git a/deployments/helm/v2/onap4k8s/emco-tools/requirements.yaml b/deployments/helm/v2/emco/emco-tools/requirements.yaml
index ddb91c51..ddb91c51 100644
--- a/deployments/helm/v2/onap4k8s/emco-tools/requirements.yaml
+++ b/deployments/helm/v2/emco/emco-tools/requirements.yaml
diff --git a/deployments/helm/v2/onap4k8s/emco-tools/values.yaml b/deployments/helm/v2/emco/emco-tools/values.yaml
index 359d73bc..359d73bc 100644
--- a/deployments/helm/v2/onap4k8s/emco-tools/values.yaml
+++ b/deployments/helm/v2/emco/emco-tools/values.yaml
diff --git a/deployments/helm/v2/onap4k8s/emco/Chart.yaml b/deployments/helm/v2/emco/emco/Chart.yaml
index d14197ff..d14197ff 100644
--- a/deployments/helm/v2/onap4k8s/emco/Chart.yaml
+++ b/deployments/helm/v2/emco/emco/Chart.yaml
diff --git a/deployments/helm/v2/onap4k8s/emco/requirements.yaml b/deployments/helm/v2/emco/emco/requirements.yaml
index 21649c38..21649c38 100644
--- a/deployments/helm/v2/onap4k8s/emco/requirements.yaml
+++ b/deployments/helm/v2/emco/emco/requirements.yaml
diff --git a/deployments/helm/v2/onap4k8s/emco/values.yaml b/deployments/helm/v2/emco/emco/values.yaml
index b0078f38..b0078f38 100644
--- a/deployments/helm/v2/onap4k8s/emco/values.yaml
+++ b/deployments/helm/v2/emco/emco/values.yaml
diff --git a/deployments/helm/v2/onap4k8s/etcd/.helmignore b/deployments/helm/v2/emco/etcd/.helmignore
index f0c13194..f0c13194 100644
--- a/deployments/helm/v2/onap4k8s/etcd/.helmignore
+++ b/deployments/helm/v2/emco/etcd/.helmignore
diff --git a/deployments/helm/v2/onap4k8s/etcd/Chart.yaml b/deployments/helm/v2/emco/etcd/Chart.yaml
index 210b3279..210b3279 100644
--- a/deployments/helm/v2/onap4k8s/etcd/Chart.yaml
+++ b/deployments/helm/v2/emco/etcd/Chart.yaml
diff --git a/deployments/helm/v2/onap4k8s/etcd/requirements.yaml b/deployments/helm/v2/emco/etcd/requirements.yaml
index d71b975c..d71b975c 100644
--- a/deployments/helm/v2/onap4k8s/etcd/requirements.yaml
+++ b/deployments/helm/v2/emco/etcd/requirements.yaml
diff --git a/deployments/helm/v2/onap4k8s/etcd/templates/pv.yaml b/deployments/helm/v2/emco/etcd/templates/pv.yaml
index f0cf59ce..f0cf59ce 100644
--- a/deployments/helm/v2/onap4k8s/etcd/templates/pv.yaml
+++ b/deployments/helm/v2/emco/etcd/templates/pv.yaml
diff --git a/deployments/helm/v2/onap4k8s/etcd/templates/service.yaml b/deployments/helm/v2/emco/etcd/templates/service.yaml
index 692faa9f..692faa9f 100644
--- a/deployments/helm/v2/onap4k8s/etcd/templates/service.yaml
+++ b/deployments/helm/v2/emco/etcd/templates/service.yaml
diff --git a/deployments/helm/v2/onap4k8s/etcd/templates/statefulset.yaml b/deployments/helm/v2/emco/etcd/templates/statefulset.yaml
index d0387f8e..d0387f8e 100644
--- a/deployments/helm/v2/onap4k8s/etcd/templates/statefulset.yaml
+++ b/deployments/helm/v2/emco/etcd/templates/statefulset.yaml
diff --git a/deployments/helm/v2/onap4k8s/etcd/values.yaml b/deployments/helm/v2/emco/etcd/values.yaml
index 226b4594..226b4594 100644
--- a/deployments/helm/v2/onap4k8s/etcd/values.yaml
+++ b/deployments/helm/v2/emco/etcd/values.yaml
diff --git a/deployments/helm/v2/onap4k8s/fluentd/.helmignore b/deployments/helm/v2/emco/fluentd/.helmignore
index f0c13194..f0c13194 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/.helmignore
+++ b/deployments/helm/v2/emco/fluentd/.helmignore
diff --git a/deployments/helm/v2/onap4k8s/fluentd/Chart.yaml b/deployments/helm/v2/emco/fluentd/Chart.yaml
index 9885c28c..9885c28c 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/Chart.yaml
+++ b/deployments/helm/v2/emco/fluentd/Chart.yaml
diff --git a/deployments/helm/v2/onap4k8s/fluentd/README.md b/deployments/helm/v2/emco/fluentd/README.md
index ac07a7f2..ac07a7f2 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/README.md
+++ b/deployments/helm/v2/emco/fluentd/README.md
diff --git a/deployments/helm/v2/onap4k8s/fluentd/templates/NOTES.txt b/deployments/helm/v2/emco/fluentd/templates/NOTES.txt
index eea7a2aa..eea7a2aa 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/templates/NOTES.txt
+++ b/deployments/helm/v2/emco/fluentd/templates/NOTES.txt
diff --git a/deployments/helm/v2/onap4k8s/fluentd/templates/_helpers.tpl b/deployments/helm/v2/emco/fluentd/templates/_helpers.tpl
index f72f6e33..f72f6e33 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/templates/_helpers.tpl
+++ b/deployments/helm/v2/emco/fluentd/templates/_helpers.tpl
diff --git a/deployments/helm/v2/onap4k8s/fluentd/templates/aggregator-configmap.yaml b/deployments/helm/v2/emco/fluentd/templates/aggregator-configmap.yaml
index 885e3b99..885e3b99 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/templates/aggregator-configmap.yaml
+++ b/deployments/helm/v2/emco/fluentd/templates/aggregator-configmap.yaml
diff --git a/deployments/helm/v2/onap4k8s/fluentd/templates/aggregator-statefulset.yaml b/deployments/helm/v2/emco/fluentd/templates/aggregator-statefulset.yaml
index 40957cf2..40957cf2 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/templates/aggregator-statefulset.yaml
+++ b/deployments/helm/v2/emco/fluentd/templates/aggregator-statefulset.yaml
diff --git a/deployments/helm/v2/onap4k8s/fluentd/templates/aggregator-svc.yaml b/deployments/helm/v2/emco/fluentd/templates/aggregator-svc.yaml
index 4ae43793..4ae43793 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/templates/aggregator-svc.yaml
+++ b/deployments/helm/v2/emco/fluentd/templates/aggregator-svc.yaml
diff --git a/deployments/helm/v2/onap4k8s/fluentd/templates/clusterrole.yaml b/deployments/helm/v2/emco/fluentd/templates/clusterrole.yaml
index e4c9f50e..e4c9f50e 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/templates/clusterrole.yaml
+++ b/deployments/helm/v2/emco/fluentd/templates/clusterrole.yaml
diff --git a/deployments/helm/v2/onap4k8s/fluentd/templates/clusterrolebinding.yaml b/deployments/helm/v2/emco/fluentd/templates/clusterrolebinding.yaml
index 79c36e4e..79c36e4e 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/templates/clusterrolebinding.yaml
+++ b/deployments/helm/v2/emco/fluentd/templates/clusterrolebinding.yaml
diff --git a/deployments/helm/v2/onap4k8s/fluentd/templates/forwarder-configmap.yaml b/deployments/helm/v2/emco/fluentd/templates/forwarder-configmap.yaml
index 4fe7a762..4fe7a762 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/templates/forwarder-configmap.yaml
+++ b/deployments/helm/v2/emco/fluentd/templates/forwarder-configmap.yaml
diff --git a/deployments/helm/v2/onap4k8s/fluentd/templates/forwarder-daemonset.yaml b/deployments/helm/v2/emco/fluentd/templates/forwarder-daemonset.yaml
index 7c6e44df..7c6e44df 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/templates/forwarder-daemonset.yaml
+++ b/deployments/helm/v2/emco/fluentd/templates/forwarder-daemonset.yaml
diff --git a/deployments/helm/v2/onap4k8s/fluentd/templates/forwarder-svc.yaml b/deployments/helm/v2/emco/fluentd/templates/forwarder-svc.yaml
index a47d37b8..a47d37b8 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/templates/forwarder-svc.yaml
+++ b/deployments/helm/v2/emco/fluentd/templates/forwarder-svc.yaml
diff --git a/deployments/helm/v2/onap4k8s/fluentd/templates/metrics-svc.yaml b/deployments/helm/v2/emco/fluentd/templates/metrics-svc.yaml
index 2b0c92f1..2b0c92f1 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/templates/metrics-svc.yaml
+++ b/deployments/helm/v2/emco/fluentd/templates/metrics-svc.yaml
diff --git a/deployments/helm/v2/onap4k8s/fluentd/templates/serviceaccount.yaml b/deployments/helm/v2/emco/fluentd/templates/serviceaccount.yaml
index 1e584759..1e584759 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/templates/serviceaccount.yaml
+++ b/deployments/helm/v2/emco/fluentd/templates/serviceaccount.yaml
diff --git a/deployments/helm/v2/onap4k8s/fluentd/templates/servicemonitor.yaml b/deployments/helm/v2/emco/fluentd/templates/servicemonitor.yaml
index e884ac56..e884ac56 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/templates/servicemonitor.yaml
+++ b/deployments/helm/v2/emco/fluentd/templates/servicemonitor.yaml
diff --git a/deployments/helm/v2/onap4k8s/fluentd/templates/svc-headless.yaml b/deployments/helm/v2/emco/fluentd/templates/svc-headless.yaml
index a64899a4..a64899a4 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/templates/svc-headless.yaml
+++ b/deployments/helm/v2/emco/fluentd/templates/svc-headless.yaml
diff --git a/deployments/helm/v2/onap4k8s/fluentd/templates/tls-certs.yaml b/deployments/helm/v2/emco/fluentd/templates/tls-certs.yaml
index c37eb849..c37eb849 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/templates/tls-certs.yaml
+++ b/deployments/helm/v2/emco/fluentd/templates/tls-certs.yaml
diff --git a/deployments/helm/v2/onap4k8s/fluentd/values-production.yaml b/deployments/helm/v2/emco/fluentd/values-production.yaml
index d1bc5e26..d1bc5e26 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/values-production.yaml
+++ b/deployments/helm/v2/emco/fluentd/values-production.yaml
diff --git a/deployments/helm/v2/onap4k8s/fluentd/values.yaml b/deployments/helm/v2/emco/fluentd/values.yaml
index 1feb2a19..1feb2a19 100644
--- a/deployments/helm/v2/onap4k8s/fluentd/values.yaml
+++ b/deployments/helm/v2/emco/fluentd/values.yaml
diff --git a/deployments/helm/v2/onap4k8s/mongo/.helmignore b/deployments/helm/v2/emco/mongo/.helmignore
index f0c13194..f0c13194 100644
--- a/deployments/helm/v2/onap4k8s/mongo/.helmignore
+++ b/deployments/helm/v2/emco/mongo/.helmignore
diff --git a/deployments/helm/v2/onap4k8s/mongo/Chart.yaml b/deployments/helm/v2/emco/mongo/Chart.yaml
index da922111..da922111 100644
--- a/deployments/helm/v2/onap4k8s/mongo/Chart.yaml
+++ b/deployments/helm/v2/emco/mongo/Chart.yaml
diff --git a/deployments/helm/v2/onap4k8s/mongo/requirements.yaml b/deployments/helm/v2/emco/mongo/requirements.yaml
index 38a832b8..38a832b8 100644
--- a/deployments/helm/v2/onap4k8s/mongo/requirements.yaml
+++ b/deployments/helm/v2/emco/mongo/requirements.yaml
diff --git a/deployments/helm/v2/onap4k8s/mongo/templates/nfs-provisoner.yaml b/deployments/helm/v2/emco/mongo/templates/nfs-provisoner.yaml
index 355ad382..355ad382 100644
--- a/deployments/helm/v2/onap4k8s/mongo/templates/nfs-provisoner.yaml
+++ b/deployments/helm/v2/emco/mongo/templates/nfs-provisoner.yaml
diff --git a/deployments/helm/v2/onap4k8s/mongo/templates/pv.yaml b/deployments/helm/v2/emco/mongo/templates/pv.yaml
index 824dcbb8..824dcbb8 100644
--- a/deployments/helm/v2/onap4k8s/mongo/templates/pv.yaml
+++ b/deployments/helm/v2/emco/mongo/templates/pv.yaml
diff --git a/deployments/helm/v2/onap4k8s/mongo/templates/pvc.yaml b/deployments/helm/v2/emco/mongo/templates/pvc.yaml
index 372c1068..372c1068 100644
--- a/deployments/helm/v2/onap4k8s/mongo/templates/pvc.yaml
+++ b/deployments/helm/v2/emco/mongo/templates/pvc.yaml
diff --git a/deployments/helm/v2/onap4k8s/mongo/templates/service.yaml b/deployments/helm/v2/emco/mongo/templates/service.yaml
index df55854e..df55854e 100644
--- a/deployments/helm/v2/onap4k8s/mongo/templates/service.yaml
+++ b/deployments/helm/v2/emco/mongo/templates/service.yaml
diff --git a/deployments/helm/v2/onap4k8s/mongo/templates/statefulset.yaml b/deployments/helm/v2/emco/mongo/templates/statefulset.yaml
index 56f669e9..56f669e9 100644
--- a/deployments/helm/v2/onap4k8s/mongo/templates/statefulset.yaml
+++ b/deployments/helm/v2/emco/mongo/templates/statefulset.yaml
diff --git a/deployments/helm/v2/onap4k8s/mongo/templates/storageclass.yaml b/deployments/helm/v2/emco/mongo/templates/storageclass.yaml
index 3cd502ea..3cd502ea 100644
--- a/deployments/helm/v2/onap4k8s/mongo/templates/storageclass.yaml
+++ b/deployments/helm/v2/emco/mongo/templates/storageclass.yaml
diff --git a/deployments/helm/v2/onap4k8s/mongo/values.yaml b/deployments/helm/v2/emco/mongo/values.yaml
index 0a6f8570..0a6f8570 100644
--- a/deployments/helm/v2/onap4k8s/mongo/values.yaml
+++ b/deployments/helm/v2/emco/mongo/values.yaml
diff --git a/deployments/helm/v2/onap4k8s/ncm/Chart.yaml b/deployments/helm/v2/emco/ncm/Chart.yaml
index 224cc2d7..224cc2d7 100644
--- a/deployments/helm/v2/onap4k8s/ncm/Chart.yaml
+++ b/deployments/helm/v2/emco/ncm/Chart.yaml
diff --git a/deployments/helm/v2/onap4k8s/ncm/requirements.yaml b/deployments/helm/v2/emco/ncm/requirements.yaml
index c2253cf4..c2253cf4 100644
--- a/deployments/helm/v2/onap4k8s/ncm/requirements.yaml
+++ b/deployments/helm/v2/emco/ncm/requirements.yaml
diff --git a/deployments/helm/v2/onap4k8s/ncm/resources/config/config.json b/deployments/helm/v2/emco/ncm/resources/config/config.json
index f1fad4b2..f1fad4b2 100644
--- a/deployments/helm/v2/onap4k8s/ncm/resources/config/config.json
+++ b/deployments/helm/v2/emco/ncm/resources/config/config.json
diff --git a/deployments/helm/v2/onap4k8s/ncm/templates/configmap.yaml b/deployments/helm/v2/emco/ncm/templates/configmap.yaml
index c9d55fed..c9d55fed 100644
--- a/deployments/helm/v2/onap4k8s/ncm/templates/configmap.yaml
+++ b/deployments/helm/v2/emco/ncm/templates/configmap.yaml
diff --git a/deployments/helm/v2/onap4k8s/ncm/templates/deployment.yaml b/deployments/helm/v2/emco/ncm/templates/deployment.yaml
index cf73fe21..cf73fe21 100644
--- a/deployments/helm/v2/onap4k8s/ncm/templates/deployment.yaml
+++ b/deployments/helm/v2/emco/ncm/templates/deployment.yaml
diff --git a/deployments/helm/v2/onap4k8s/ncm/templates/service.yaml b/deployments/helm/v2/emco/ncm/templates/service.yaml
index c9ab68d3..c9ab68d3 100644
--- a/deployments/helm/v2/onap4k8s/ncm/templates/service.yaml
+++ b/deployments/helm/v2/emco/ncm/templates/service.yaml
diff --git a/deployments/helm/v2/onap4k8s/ncm/values.yaml b/deployments/helm/v2/emco/ncm/values.yaml
index 23725589..23725589 100644
--- a/deployments/helm/v2/onap4k8s/ncm/values.yaml
+++ b/deployments/helm/v2/emco/ncm/values.yaml
diff --git a/deployments/helm/v2/onap4k8s/orchestrator/Chart.yaml b/deployments/helm/v2/emco/orchestrator/Chart.yaml
index 8c0f1d98..8c0f1d98 100644
--- a/deployments/helm/v2/onap4k8s/orchestrator/Chart.yaml
+++ b/deployments/helm/v2/emco/orchestrator/Chart.yaml
diff --git a/deployments/helm/v2/onap4k8s/orchestrator/requirements.yaml b/deployments/helm/v2/emco/orchestrator/requirements.yaml
index c2253cf4..c2253cf4 100644
--- a/deployments/helm/v2/onap4k8s/orchestrator/requirements.yaml
+++ b/deployments/helm/v2/emco/orchestrator/requirements.yaml
diff --git a/deployments/helm/v2/onap4k8s/orchestrator/resources/config/config.json b/deployments/helm/v2/emco/orchestrator/resources/config/config.json
index 83b035e9..83b035e9 100644
--- a/deployments/helm/v2/onap4k8s/orchestrator/resources/config/config.json
+++ b/deployments/helm/v2/emco/orchestrator/resources/config/config.json
diff --git a/deployments/helm/v2/onap4k8s/orchestrator/templates/configmap.yaml b/deployments/helm/v2/emco/orchestrator/templates/configmap.yaml
index c9d55fed..c9d55fed 100644
--- a/deployments/helm/v2/onap4k8s/orchestrator/templates/configmap.yaml
+++ b/deployments/helm/v2/emco/orchestrator/templates/configmap.yaml
diff --git a/deployments/helm/v2/onap4k8s/orchestrator/templates/deployment.yaml b/deployments/helm/v2/emco/orchestrator/templates/deployment.yaml
index dea9f79c..dea9f79c 100644
--- a/deployments/helm/v2/onap4k8s/orchestrator/templates/deployment.yaml
+++ b/deployments/helm/v2/emco/orchestrator/templates/deployment.yaml
diff --git a/deployments/helm/v2/onap4k8s/orchestrator/templates/service.yaml b/deployments/helm/v2/emco/orchestrator/templates/service.yaml
index c9ab68d3..c9ab68d3 100644
--- a/deployments/helm/v2/onap4k8s/orchestrator/templates/service.yaml
+++ b/deployments/helm/v2/emco/orchestrator/templates/service.yaml
diff --git a/deployments/helm/v2/onap4k8s/orchestrator/values.yaml b/deployments/helm/v2/emco/orchestrator/values.yaml
index 6c65fd61..6c65fd61 100644
--- a/deployments/helm/v2/onap4k8s/orchestrator/values.yaml
+++ b/deployments/helm/v2/emco/orchestrator/values.yaml
diff --git a/deployments/helm/v2/onap4k8s/ovnaction/Chart.yaml b/deployments/helm/v2/emco/ovnaction/Chart.yaml
index 9047dd0f..9047dd0f 100644
--- a/deployments/helm/v2/onap4k8s/ovnaction/Chart.yaml
+++ b/deployments/helm/v2/emco/ovnaction/Chart.yaml
diff --git a/deployments/helm/v2/onap4k8s/ovnaction/requirements.yaml b/deployments/helm/v2/emco/ovnaction/requirements.yaml
index c2253cf4..c2253cf4 100644
--- a/deployments/helm/v2/onap4k8s/ovnaction/requirements.yaml
+++ b/deployments/helm/v2/emco/ovnaction/requirements.yaml
diff --git a/deployments/helm/v2/onap4k8s/ovnaction/resources/config/config.json b/deployments/helm/v2/emco/ovnaction/resources/config/config.json
index 1fdfafce..1fdfafce 100644
--- a/deployments/helm/v2/onap4k8s/ovnaction/resources/config/config.json
+++ b/deployments/helm/v2/emco/ovnaction/resources/config/config.json
diff --git a/deployments/helm/v2/onap4k8s/ovnaction/templates/configmap.yaml b/deployments/helm/v2/emco/ovnaction/templates/configmap.yaml
index c9d55fed..c9d55fed 100644
--- a/deployments/helm/v2/onap4k8s/ovnaction/templates/configmap.yaml
+++ b/deployments/helm/v2/emco/ovnaction/templates/configmap.yaml
diff --git a/deployments/helm/v2/onap4k8s/ovnaction/templates/deployment.yaml b/deployments/helm/v2/emco/ovnaction/templates/deployment.yaml
index 261b6ef2..261b6ef2 100644
--- a/deployments/helm/v2/onap4k8s/ovnaction/templates/deployment.yaml
+++ b/deployments/helm/v2/emco/ovnaction/templates/deployment.yaml
diff --git a/deployments/helm/v2/onap4k8s/ovnaction/templates/service.yaml b/deployments/helm/v2/emco/ovnaction/templates/service.yaml
index 9bf887ed..9bf887ed 100644
--- a/deployments/helm/v2/onap4k8s/ovnaction/templates/service.yaml
+++ b/deployments/helm/v2/emco/ovnaction/templates/service.yaml
diff --git a/deployments/helm/v2/onap4k8s/ovnaction/values.yaml b/deployments/helm/v2/emco/ovnaction/values.yaml
index a617f847..a617f847 100644
--- a/deployments/helm/v2/onap4k8s/ovnaction/values.yaml
+++ b/deployments/helm/v2/emco/ovnaction/values.yaml
diff --git a/deployments/helm/v2/onap4k8s/rsync/Chart.yaml b/deployments/helm/v2/emco/rsync/Chart.yaml
index 25043af1..25043af1 100644
--- a/deployments/helm/v2/onap4k8s/rsync/Chart.yaml
+++ b/deployments/helm/v2/emco/rsync/Chart.yaml
diff --git a/deployments/helm/v2/onap4k8s/rsync/requirements.yaml b/deployments/helm/v2/emco/rsync/requirements.yaml
index c2253cf4..c2253cf4 100644
--- a/deployments/helm/v2/onap4k8s/rsync/requirements.yaml
+++ b/deployments/helm/v2/emco/rsync/requirements.yaml
diff --git a/deployments/helm/v2/onap4k8s/rsync/resources/config/config.json b/deployments/helm/v2/emco/rsync/resources/config/config.json
index 56744d63..56744d63 100644
--- a/deployments/helm/v2/onap4k8s/rsync/resources/config/config.json
+++ b/deployments/helm/v2/emco/rsync/resources/config/config.json
diff --git a/deployments/helm/v2/onap4k8s/rsync/templates/configmap.yaml b/deployments/helm/v2/emco/rsync/templates/configmap.yaml
index c9d55fed..c9d55fed 100644
--- a/deployments/helm/v2/onap4k8s/rsync/templates/configmap.yaml
+++ b/deployments/helm/v2/emco/rsync/templates/configmap.yaml
diff --git a/deployments/helm/v2/onap4k8s/rsync/templates/deployment.yaml b/deployments/helm/v2/emco/rsync/templates/deployment.yaml
index cf73fe21..cf73fe21 100644
--- a/deployments/helm/v2/onap4k8s/rsync/templates/deployment.yaml
+++ b/deployments/helm/v2/emco/rsync/templates/deployment.yaml
diff --git a/deployments/helm/v2/onap4k8s/rsync/templates/service.yaml b/deployments/helm/v2/emco/rsync/templates/service.yaml
index c9ab68d3..c9ab68d3 100644
--- a/deployments/helm/v2/onap4k8s/rsync/templates/service.yaml
+++ b/deployments/helm/v2/emco/rsync/templates/service.yaml
diff --git a/deployments/helm/v2/onap4k8s/rsync/values.yaml b/deployments/helm/v2/emco/rsync/values.yaml
index ef4732e3..ef4732e3 100644
--- a/deployments/helm/v2/onap4k8s/rsync/values.yaml
+++ b/deployments/helm/v2/emco/rsync/values.yaml
diff --git a/kud/deployment_infra/playbooks/configure-emco-reset.yml b/kud/deployment_infra/playbooks/configure-emco-reset.yml
new file mode 100644
index 00000000..a4560cc2
--- /dev/null
+++ b/kud/deployment_infra/playbooks/configure-emco-reset.yml
@@ -0,0 +1,56 @@
+---
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+- hosts: kube-master
+  tasks:
+    - name: Load kud variables
+      include_vars:
+        file: kud-vars.yml
+
+    - name: Change the emco directory and run helm delete
+      command: /usr/local/bin/helm delete --purge emco
+      register: helm_delete
+      args:
+        chdir: /opt/multicloud/deployments/helm/v2/emco
+
+    - debug:
+        var: helm_delete.stdout_lines
+
+    - name: Change the emco directory and delete the emco namespace
+      command: /usr/local/bin/kubectl delete ns emco
+      register: delete_emco_ns
+      args:
+        chdir: /opt/multicloud/deployments/helm/v2/emco
+
+    - debug:
+        var: delete_emco_ns.stdout_lines
+
+    - name: Change the emco directory and make clean
+      command: /usr/bin/make clean
+      register: make_clean
+      args:
+        chdir: /opt/multicloud/deployments/helm/v2/emco
+
+    - debug:
+        var: make_clean.stdout_lines
+
+    - name: Change the emco directory and make repo-stop
+      command: /usr/bin/make repo-stop
+      register: make_repo_stop
+      args:
+        chdir: /opt/multicloud/deployments/helm/v2/emco
+
+    - debug:
+        var: make_repo_stop.stdout_lines
+
+    - name: clean multicloud-k8s path
+      file:
+        state: absent
+        path: /opt/multicloud
diff --git a/kud/deployment_infra/playbooks/configure-emco.yml b/kud/deployment_infra/playbooks/configure-emco.yml
new file mode 100644
index 00000000..255ce6a4
--- /dev/null
+++ b/kud/deployment_infra/playbooks/configure-emco.yml
@@ -0,0 +1,55 @@
+---
+# SPDX-license-identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+- hosts: kube-master
+  tasks:
+    - name: Load kud variables
+      include_vars:
+        file: kud-vars.yml
+
+    - name: Getting emco code in /opt folder
+      git:
+        repo: 'https://github.com/onap/multicloud-k8s.git'
+        dest: /opt/multicloud
+
+    - name: install make package for ubuntu systems
+      apt: name=make state=present update_cache=yes
+      when: ansible_distribution == "Ubuntu"
+
+    - name: install make package for centos systems
+      yum: name=make state=present update_cache=yes
+      when: ansible_distribution == "CentOS"
+
+    - name: Change the emco directory and run the command make repo
+      command: /usr/bin/make repo
+      register: make_repo
+      args:
+        chdir: /opt/multicloud/deployments/helm/v2/emco
+
+    - debug:
+        var: make_repo.stdout_lines
+
+    - name: Change the emco directory and run the command make all
+      command: /usr/bin/make all
+      register: make_all
+      args:
+        chdir: /opt/multicloud/deployments/helm/v2/emco
+
+    - debug:
+        var: make_all.stdout_lines
+
+    - name: Change the emco directory and run the command helm install
+      command: /usr/local/bin/helm install dist/packages/emco-0.1.0.tgz --name emco --namespace emco
+      register: helm_install
+      args:
+        chdir: /opt/multicloud/deployments/helm/v2/emco
+
+    - debug:
+        var: helm_install.stdout_lines
diff --git a/kud/deployment_infra/playbooks/configure-onap4k8s-reset.yml b/kud/deployment_infra/playbooks/configure-onap4k8s-reset.yml
index 6adaf2ee..d6f2f6bc 100644
--- a/kud/deployment_infra/playbooks/configure-onap4k8s-reset.yml
+++ b/kud/deployment_infra/playbooks/configure-onap4k8s-reset.yml
@@ -23,7 +23,7 @@
     - debug:
         var: helm_delete.stdout_lines
 
-    - name: Change the onap4k8s directory and delete the ona4k8s-ns namespace
+    - name: Change the onap4k8s directory and delete the onap4k8s-ns namespace
       command: /usr/local/bin/kubectl delete ns onap4k8s-ns
       register: delete_onap_ns
       args:
diff --git a/kud/tests/sanity-check-for-v2.sh b/kud/tests/emco.sh
index 80dc2d5c..80dc2d5c 100755
--- a/kud/tests/sanity-check-for-v2.sh
+++ b/kud/tests/emco.sh