From: mmis <michael.morris@ericsson.com>
Date: Wed, 19 Sep 2018 11:44:35 +0000 (+0100)
Subject: Fixed mount point for policy-apex-pdp config file
X-Git-Tag: 3.0.0-ONAP~304^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=0d92fb7ed1b3b7f11d5bba72cff571b52facf251;p=oom.git

Fixed mount point for policy-apex-pdp config file

/home/apexuser/config/config.json was being created as a directory rather
than a file
Also updated parameter class names in config file to match new names of
the classes

Issue-ID: POLICY-1124
Change-Id: I19a683bd722ba3767400f95e2a112cacf1dbe7cb
Signed-off-by: mmis <michael.morris@ericsson.com>
---

diff --git a/kubernetes/policy/charts/policy-apex-pdp/resources/config/config.json b/kubernetes/policy/charts/policy-apex-pdp/resources/config/config.json
index 5db1839ac9..c8908c7b91 100644
--- a/kubernetes/policy/charts/policy-apex-pdp/resources/config/config.json
+++ b/kubernetes/policy/charts/policy-apex-pdp/resources/config/config.json
@@ -43,7 +43,7 @@
             "carrierTechnologyParameters" : {
               "carrierTechnology" : "RESTSERVER",
               "parameterClassName" :
-                "org.onap.policy.apex.plugins.event.carrier.restserver.RESTServerCarrierTechnologyParameters",
+                "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters",
               "parameters" : {
                 "standalone" : true,
                 "host" : "localhost",
@@ -63,7 +63,7 @@
             "carrierTechnologyParameters":{
               "carrierTechnology" : "RESTSERVER",
               "parameterClassName" :
-                "org.onap.policy.apex.plugins.event.carrier.restserver.RESTServerCarrierTechnologyParameters"
+                "org.onap.policy.apex.plugins.event.carrier.restserver.RestServerCarrierTechnologyParameters"
             },
             "eventProtocolParameters":{
               "eventProtocol" : "JSON"
diff --git a/kubernetes/policy/charts/policy-apex-pdp/templates/configmap.yaml b/kubernetes/policy/charts/policy-apex-pdp/templates/configmap.yaml
index d35b5de4c2..318ad34491 100644
--- a/kubernetes/policy/charts/policy-apex-pdp/templates/configmap.yaml
+++ b/kubernetes/policy/charts/policy-apex-pdp/templates/configmap.yaml
@@ -22,5 +22,5 @@ metadata:
   name: {{ include "common.fullname" . }}-configmap
   namespace: {{ include "common.namespace" . }}
 data:
-{{ tpl (.Files.Glob "resources/config/*").AsConfig . | indent 2 }}
+{{ tpl (.Files.Glob "resources/config/config.json").AsConfig . | indent 2 }}
 
diff --git a/kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml b/kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml
index a1083b2809..e53dc01954 100644
--- a/kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml
+++ b/kubernetes/policy/charts/policy-apex-pdp/templates/statefulset.yaml
@@ -69,9 +69,8 @@ spec:
             readOnly: true
           - mountPath: /var/log/onap
             name: policy-logs
-          - mountPath: /home/apexuser/config/config.json
+          - mountPath: /home/apexuser/config
             name: apexconfig
-            subpath: config.json
           resources:
 {{ toYaml .Values.resources | indent 12 }}
         {{- if .Values.nodeSelector }}
@@ -91,9 +90,6 @@ spec:
         - name: apexconfig
           configMap:
             name: {{ include "common.fullname" . }}-configmap
-            items:
-            - key: config.json
-              path: config.json
-              mode: 0755
+            defaultMode: 0755
       imagePullSecrets:
       - name: "{{ include "common.namespace" . }}-docker-registry-key"