15 files changed, 31 insertions, 45 deletions
diff --git a/deployments/helm/v2/emco/Makefile b/deployments/helm/v2/emco/Makefile
index dc88ff86..355fc3f6 100644
--- a/deployments/helm/v2/emco/Makefile
+++ b/deployments/helm/v2/emco/Makefile
@@ -64,16 +64,5 @@ clean:
 	@rm -rf $(PACKAGE_DIR)/*
 	@rm -rf $(OUTPUT_DIR)
 
-# start up a local helm repo to serve up helm chart packages
-repo:
-	@mkdir -p $(PACKAGE_DIR)
-	@helm serve --repo-path $(PACKAGE_DIR) &
-	@helm repo index $(PACKAGE_DIR)
-	@helm repo add local http://127.0.0.1:8879
-
-# stop local helm repo
-repo-stop:
-	@pkill helm
-	@helm repo remove local
 %:
 	@:
diff --git a/deployments/helm/v2/emco/README.md b/deployments/helm/v2/emco/README.md
index 407f4509..70cbfcde 100644
--- a/deployments/helm/v2/emco/README.md
+++ b/deployments/helm/v2/emco/README.md
@@ -6,11 +6,7 @@ EMCO Helm charts include charts for EMCO microservices along with MongoDb, etcd,
 
 
 ### Steps to generate and install packages
-**1. Create a local helm repo from Makefile**
-
-`$ make repo`
-
-**2. Run make file to package all the required chart**
+**1. Run make file to package all the required chart**
 
 `$ make clean`
 
@@ -26,13 +22,13 @@ Pacakges helm charts in tar.gz format. All packages are in **dist/packages** dir
   | **emco-0.1.0.tgz**   | Includes all charts including database, all services and tools        |
 
 
-**3. Deploy EMCO Packages for Databases and Services**
+**2. Deploy EMCO Packages for Databases and Services**
 
 `$ helm install dist/packages/emco-db-0.1.0.tgz --name emco-db --namespace emco`
 
 `$ helm install dist/packages/emco-services-0.1.0.tgz --name emco-services --namespace emco`
 
-**4. Deploy tools (Optional)**
+**3. Deploy tools (Optional)**
 
 `$ helm install dist/packages/emco-tools-0.1.0.tgz --name emco-tools --namespace emco`
 
@@ -41,12 +37,12 @@ NOTE: Deploy the Chart emco-0.1.0.tgz to deploy all packages including database,
 `$ helm install dist/packages/emco-0.1.0.tgz --name emco --namespace emco`
 
 
-**5. To check logs of the different Microservices check fluentd logs**
+**4. To check logs of the different Microservices check fluentd logs**
 
 `kubectl logs emco-tools-fluentd-0 -n emco | grep orchestrator`
 
 
-**6. Delete all packages**
+**5. Delete all packages**
 
 `$ helm delete emco-services --purge`
 
@@ -61,7 +57,7 @@ NOTE: If the Chart emco-0.1.0.tgz was deployed
 `$ helm delete emco --purge`
 
 
-**7. Delete local helm repo**
+**6. Delete local helm repo**
 
 `make repo-stop`
 
@@ -74,4 +70,4 @@ After deleting the db package and before installing the package again following
 Workarounds:
 
 * remove the  finalizers section using `kubectl edit persistentvolumes emco-db-emco-etcd-data-0`
-* or, if appropriate, delete the entire namespace using `kubectl delete namespace emco`
-\ No newline at end of file
+* or, if appropriate, delete the entire namespace using `kubectl delete namespace emco`
diff --git a/deployments/helm/v2/emco/clm/requirements.yaml b/deployments/helm/v2/emco/clm/requirements.yaml
index c2253cf4..bba5c27d 100644
--- a/deployments/helm/v2/emco/clm/requirements.yaml
+++ b/deployments/helm/v2/emco/clm/requirements.yaml
@@ -15,4 +15,4 @@
 dependencies:
   - name: common
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/dcm/requirements.yaml b/deployments/helm/v2/emco/dcm/requirements.yaml
index a3792606..c5c20127 100644
--- a/deployments/helm/v2/emco/dcm/requirements.yaml
+++ b/deployments/helm/v2/emco/dcm/requirements.yaml
@@ -15,4 +15,4 @@
 dependencies:
   - name: common
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/emco-db/requirements.yaml b/deployments/helm/v2/emco/emco-db/requirements.yaml
index 52a40b64..62e807b6 100644
--- a/deployments/helm/v2/emco/emco-db/requirements.yaml
+++ b/deployments/helm/v2/emco/emco-db/requirements.yaml
@@ -15,10 +15,10 @@
 dependencies:
   - name: common
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../common'
   - name: mongo
     version: ~4.x-0
-    repository: '@local'
+    repository: 'file://../mongo'
   - name: etcd
     version: ~3.x-0
-    repository: '@local'
+    repository: 'file://../etcd'
diff --git a/deployments/helm/v2/emco/emco-services/requirements.yaml b/deployments/helm/v2/emco/emco-services/requirements.yaml
index dbb14661..ddb9fb7f 100644
--- a/deployments/helm/v2/emco/emco-services/requirements.yaml
+++ b/deployments/helm/v2/emco/emco-services/requirements.yaml
@@ -15,22 +15,22 @@
 dependencies:
   - name: common
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../common'
   - name: orchestrator
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../orchestrator'
   - name: ncm
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../ncm'
   - name: rsync
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../rsync'
   - name: clm
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../clm'
   - name: ovnaction
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../ovnaction'
   - name: dcm
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../dcm'
diff --git a/deployments/helm/v2/emco/emco-tools/requirements.yaml b/deployments/helm/v2/emco/emco-tools/requirements.yaml
index ddb91c51..14ad537d 100644
--- a/deployments/helm/v2/emco/emco-tools/requirements.yaml
+++ b/deployments/helm/v2/emco/emco-tools/requirements.yaml
@@ -15,7 +15,7 @@
 dependencies:
   - name: common
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../common'
   - name: fluentd
     version: ~1.x-0
-    repository: '@local'
+    repository: 'file://../fluentd'
diff --git a/deployments/helm/v2/emco/emco/requirements.yaml b/deployments/helm/v2/emco/emco/requirements.yaml
index 21649c38..c704d2f2 100644
--- a/deployments/helm/v2/emco/emco/requirements.yaml
+++ b/deployments/helm/v2/emco/emco/requirements.yaml
@@ -15,11 +15,11 @@
 dependencies:
   - name: emco-db
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../emco-db'
   - name: emco-tools
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../emco-tools'
   - name: emco-services
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../emco-services'
 
diff --git a/deployments/helm/v2/emco/etcd/requirements.yaml b/deployments/helm/v2/emco/etcd/requirements.yaml
index d71b975c..9802dac4 100644
--- a/deployments/helm/v2/emco/etcd/requirements.yaml
+++ b/deployments/helm/v2/emco/etcd/requirements.yaml
@@ -15,4 +15,4 @@
 dependencies:
   - name: common
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/etcd/values.yaml b/deployments/helm/v2/emco/etcd/values.yaml
index c7156950..682af0d5 100644
--- a/deployments/helm/v2/emco/etcd/values.yaml
+++ b/deployments/helm/v2/emco/etcd/values.yaml
@@ -48,6 +48,7 @@ persistence:
   enabled: false
   volumeReclaimPolicy: Retain
   accessMode:  ReadWriteMany
+  storageType: hostPath
   storage: 1Gi
   mountPath: /dockerdata-nfs
   mountSubPath: "etcd/data"
diff --git a/deployments/helm/v2/emco/mongo/requirements.yaml b/deployments/helm/v2/emco/mongo/requirements.yaml
index 38a832b8..b8b139fa 100644
--- a/deployments/helm/v2/emco/mongo/requirements.yaml
+++ b/deployments/helm/v2/emco/mongo/requirements.yaml
@@ -15,4 +15,4 @@
 dependencies:
   - name: common
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/ncm/requirements.yaml b/deployments/helm/v2/emco/ncm/requirements.yaml
index c2253cf4..bba5c27d 100644
--- a/deployments/helm/v2/emco/ncm/requirements.yaml
+++ b/deployments/helm/v2/emco/ncm/requirements.yaml
@@ -15,4 +15,4 @@
 dependencies:
   - name: common
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/orchestrator/requirements.yaml b/deployments/helm/v2/emco/orchestrator/requirements.yaml
index c2253cf4..bba5c27d 100644
--- a/deployments/helm/v2/emco/orchestrator/requirements.yaml
+++ b/deployments/helm/v2/emco/orchestrator/requirements.yaml
@@ -15,4 +15,4 @@
 dependencies:
   - name: common
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/ovnaction/requirements.yaml b/deployments/helm/v2/emco/ovnaction/requirements.yaml
index c2253cf4..bba5c27d 100644
--- a/deployments/helm/v2/emco/ovnaction/requirements.yaml
+++ b/deployments/helm/v2/emco/ovnaction/requirements.yaml
@@ -15,4 +15,4 @@
 dependencies:
   - name: common
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../common'
diff --git a/deployments/helm/v2/emco/rsync/requirements.yaml b/deployments/helm/v2/emco/rsync/requirements.yaml
index c2253cf4..bba5c27d 100644
--- a/deployments/helm/v2/emco/rsync/requirements.yaml
+++ b/deployments/helm/v2/emco/rsync/requirements.yaml
@@ -15,4 +15,4 @@
 dependencies:
   - name: common
     version: ~0.x-0
-    repository: '@local'
+    repository: 'file://../common'