From: mayankg2703 <mayank.gupta@amdocs.com>
Date: Wed, 31 Jan 2018 13:53:19 +0000 (+0000)
Subject: sdnc dmaap config segrigation
X-Git-Tag: 2.0.0-ONAP~477
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d524cdbf140e4aa20505bd350dd776b9e0fd70f8;p=oom.git

sdnc dmaap config segrigation

Change-Id: I42697eb8c1d2d7ac8a943be09d22aaaa61b865b9
Issue-ID: OOM-640
Signed-off-by: mayankg2703 <mayank.gupta@amdocs.com>
---

diff --git a/kubernetes/config/docker/init/src/config/sdnc/dmaap/dhcpalert.properties b/kubernetes/sdnc/resources/config/dmaap/dhcpalert.properties
similarity index 100%
rename from kubernetes/config/docker/init/src/config/sdnc/dmaap/dhcpalert.properties
rename to kubernetes/sdnc/resources/config/dmaap/dhcpalert.properties
diff --git a/kubernetes/sdnc/templates/dmaap-deployment-configmap.yaml b/kubernetes/sdnc/templates/dmaap-deployment-configmap.yaml
new file mode 100644
index 0000000000..efd7d6d2af
--- /dev/null
+++ b/kubernetes/sdnc/templates/dmaap-deployment-configmap.yaml
@@ -0,0 +1,9 @@
+#{{ if not .Values.disableSdncDmaap }}
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: sdnc-dmaap-configmap
+  namespace: {{ .Values.nsPrefix }}-sdnc
+data:
+{{ tpl (.Files.Glob "resources/config/dmaap/*").AsConfig . | indent 2 }}
+#{{ end }}
diff --git a/kubernetes/sdnc/templates/dmaap-deployment.yaml b/kubernetes/sdnc/templates/dmaap-deployment.yaml
index b0f0a7b7b5..b9ba346156 100644
--- a/kubernetes/sdnc/templates/dmaap-deployment.yaml
+++ b/kubernetes/sdnc/templates/dmaap-deployment.yaml
@@ -47,14 +47,15 @@ spec:
           name: localtime
           readOnly: true
         - mountPath: /opt/onap/sdnc/data/properties/dhcpalert.properties
+          subPath: dhcpalert.properties
           name: dmaap-dhcapalert-config
       volumes:
         - name: localtime
           hostPath:
             path: /etc/localtime
         - name: dmaap-dhcapalert-config
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/dmaap/dhcpalert.properties
+          configMap:
+            name: sdnc-dmaap-configmap
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
-#{{ end }}
\ No newline at end of file
+#{{ end }}