X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fpolicy%2Fcharts%2Fpolicy-distribution%2Fresources%2Fconfig%2Fconfig.json;h=9b9a7a5a93f8d35943113c9e3af4a9c05ce2fe8f;hb=b58b9d8f84befa7086381d79f43c8d1a83a890a6;hp=906263343a42cdccb8b44da2cae6ccccaee766cd;hpb=a9a3a49dc0ea71b84c435e732811510bcea655b0;p=oom.git

diff --git a/kubernetes/policy/charts/policy-distribution/resources/config/config.json b/kubernetes/policy/charts/policy-distribution/resources/config/config.json
index 906263343a..9b9a7a5a93 100644
--- a/kubernetes/policy/charts/policy-distribution/resources/config/config.json
+++ b/kubernetes/policy/charts/policy-distribution/resources/config/config.json
@@ -21,8 +21,8 @@
     "restServerParameters":{
         "host":"0.0.0.0",
         "port":6969,
-        "userName":"healthcheck",
-        "password":"zb!XztG34",
+        "userName":"${RESTSERVER_USER}",
+        "password":"${RESTSERVER_PASSWORD}",
         "https":true
     },
     "receptionHandlerParameters":{
@@ -32,11 +32,6 @@
             "receptionHandlerConfigurationName":"sdcConfiguration",
             "pluginHandlerParameters":{
                 "policyDecoders":{
-                    "HpaDecoder":{
-                        "decoderType":"HpaDecoder",
-                        "decoderClassName":"org.onap.policy.distribution.reception.decoding.hpa.PolicyDecoderCsarHpa",
-                        "decoderConfigurationName": "csarToOptimizationPolicyConfiguration"
-                    },
                     "ToscaPolicyDecoder":{
                         "decoderType":"ToscaPolicyDecoder",
                         "decoderClassName":"org.onap.policy.distribution.reception.decoding.policy.file.PolicyDecoderFileInCsarToPolicy",
@@ -61,8 +56,8 @@
                 "messageBusAddress": [
                     "message-router"
                  ],
-                "user": "policy",
-                "password": "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U",
+                "user": "${SDCBE_USER}",
+                "password": "${SDCBE_PASSWORD}",
                 "pollingInterval":20,
                 "pollingTimeout":30,
                 "consumerId": "policy-id",
@@ -81,17 +76,6 @@
         }
     },
     "policyDecoderConfigurationParameters":{
-        "csarToOptimizationPolicyConfiguration":{
-            "parameterClassName": "org.onap.policy.distribution.reception.decoding.hpa.PolicyDecoderCsarHpaParameters",
-            "parameters":{
-                "policyNamePrefix": "oofCasablanca",
-                "onapName": "OOF",
-                "version": "1.0",
-                "priority": "3",
-                "riskType": "Test",
-                "riskLevel": "2"
-            }
-        },
         "toscaPolicyDecoderConfiguration":{
             "parameterClassName":"org.onap.policy.distribution.reception.decoding.policy.file.PolicyDecoderFileInCsarToPolicyParameterGroup",
             "parameters":{
@@ -107,14 +91,14 @@
                 "apiParameters": {
                 "hostName": "policy-api",
                 "port": 6969,
-                  "userName": "healthcheck",
-                  "password": "zb!XztG34"
+                  "userName": "${API_USER}",
+                  "password": "${API_PASSWORD}"
                  },
                 "papParameters": {
                   "hostName": "policy-pap",
                   "port": 6969,
-                 "userName": "healthcheck",
-                "password": "zb!XztG34"
+                 "userName": "${PAP_USER}",
+                "password": "${PAP_PASSWORD}"
                 },
                 "isHttps": true,
                 "deployPolicies": true