From: ramverma <ram.krishna.verma@est.tech>
Date: Tue, 30 Apr 2019 13:18:33 +0000 (+0000)
Subject: Change Policy PAP & API to https by default
X-Git-Tag: 4.0.0-ONAP~175^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F19%2F86619%2F2;p=oom.git

Change Policy PAP & API to https by default

1) Changing policy PAP & API components to start in https mode by
default.
2) Changing supportedPolicyTypes for apex to fix the ineterference between
apex & drools for legacy operational policies.
3) Changing the replicaCount of xacml to 3 so that we have enough
instances of it running to support controlloop, monitoring &
optimization PdpGroups.

Change-Id: I5271878db4c4adebc418ef63ecb09880c02082ff
Issue-ID: POLICY-1693
Signed-off-by: ramverma <ram.krishna.verma@est.tech>
---

diff --git a/kubernetes/policy/charts/policy-apex-pdp/resources/config/OnapPfConfig.json b/kubernetes/policy/charts/policy-apex-pdp/resources/config/OnapPfConfig.json
index 8edca606e4..9de4a8b5b5 100644
--- a/kubernetes/policy/charts/policy-apex-pdp/resources/config/OnapPfConfig.json
+++ b/kubernetes/policy/charts/policy-apex-pdp/resources/config/OnapPfConfig.json
@@ -11,6 +11,6 @@
         "timeIntervalMs": 120000,
         "pdpType":"apex",
         "description":"Pdp Heartbeat",
-        "supportedPolicyTypes":[{"name":"onap.policies.controlloop.Operational","version":"1.0.0"}]
+        "supportedPolicyTypes":[{"name":"onap.policies.controlloop.operational.Apex","version":"1.0.0"}]
     }
 }
diff --git a/kubernetes/policy/charts/policy-api/resources/config/config.json b/kubernetes/policy/charts/policy-api/resources/config/config.json
index 16e0a51682..397f850095 100644
--- a/kubernetes/policy/charts/policy-api/resources/config/config.json
+++ b/kubernetes/policy/charts/policy-api/resources/config/config.json
@@ -21,7 +21,9 @@
         "host":"0.0.0.0",
         "port":6969,
         "userName":"healthcheck",
-        "password":"zb!XztG34"
+        "password":"zb!XztG34",
+        "https": true,
+        "aaf": false
     },
     "databaseProviderParameters": {
         "name": "PolicyProviderParameterGroup",
@@ -32,4 +34,4 @@
         "databasePassword": "cG9saWN5X3VzZXI=",
         "persistenceUnit": "PolicyMariaDb"
     }
-}
\ No newline at end of file
+}
diff --git a/kubernetes/policy/charts/policy-pap/resources/config/config.json b/kubernetes/policy/charts/policy-pap/resources/config/config.json
index 995c951b81..fa80bf2190 100644
--- a/kubernetes/policy/charts/policy-pap/resources/config/config.json
+++ b/kubernetes/policy/charts/policy-pap/resources/config/config.json
@@ -21,7 +21,9 @@
         "host":"0.0.0.0",
         "port":6969,
         "userName":"healthcheck",
-        "password":"zb!XztG34"
+        "password":"zb!XztG34",
+        "https": true,
+        "aaf": false
     },
     "pdpParameters": {
         "updateParameters": {
diff --git a/kubernetes/policy/charts/policy-xacml-pdp/values.yaml b/kubernetes/policy/charts/policy-xacml-pdp/values.yaml
index fcfbab2471..ff0fc0a89f 100644
--- a/kubernetes/policy/charts/policy-xacml-pdp/values.yaml
+++ b/kubernetes/policy/charts/policy-xacml-pdp/values.yaml
@@ -36,7 +36,7 @@ debugEnabled: false
 # application configuration
 
 # default number of instances
-replicaCount: 1
+replicaCount: 3
 
 nodeSelector: {}