From 736bf37d0369fd88154f228efa4d94dd37156486 Mon Sep 17 00:00:00 2001
From: amatthews <adrian.matthews@est.tech>
Date: Tue, 14 Dec 2021 16:04:15 +0000
Subject: [POLICY] Service Mesh Compliance for Policy

Updating the basic requirements for Service Mesh Compliance within Policy.
Changing the DB jobs and updating the configuration files to use HTTP

Issue-ID: OOM-2253
Change-Id: If1aed68f0ed2f00d6a5cf06e5f95837f9405f65b
Signed-off-by: amatthews <adrian.matthews@est.tech>
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
---
 .../policy-distribution/resources/config/config.json          | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'kubernetes/policy/components/policy-distribution/resources')

diff --git a/kubernetes/policy/components/policy-distribution/resources/config/config.json b/kubernetes/policy/components/policy-distribution/resources/config/config.json
index 615afc6351..1aa9044eab 100755
--- a/kubernetes/policy/components/policy-distribution/resources/config/config.json
+++ b/kubernetes/policy/components/policy-distribution/resources/config/config.json
@@ -26,7 +26,7 @@
         "port":6969,
         "userName":"${RESTSERVER_USER}",
         "password":"${RESTSERVER_PASSWORD}",
-        "https":true,
+        "https": {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }},
         "prometheus": true
     },
     "receptionHandlerParameters":{
@@ -56,7 +56,7 @@
         "sdcConfiguration":{
             "parameterClassName":"org.onap.policy.distribution.reception.handling.sdc.SdcReceptionHandlerConfigurationParameterGroup",
             "parameters":{
-                "asdcAddress": "sdc-be:8443",
+                "asdcAddress": "sdc-be.{{ include "common.namespace" . }}:{{ (eq "true" (include "common.needTLS" .)) | ternary 8443 8080 }}",
                 "messageBusAddress": [
                     "message-router.{{ include "common.namespace" . }}"
                  ],
@@ -75,7 +75,8 @@
                 "keyStorePassword": "null",
                 "activeserverTlsAuth": false,
                 "isFilterinEmptyResources": true,
-                "isUseHttpsWithDmaap": true
+                "isUseHttpsWithDmaap": {{ (eq "true" (include "common.needTLS" .)) | ternary true false }},
+                "isUseHttpsWithSDC": {{ (eq "true" (include "common.needTLS" .)) | ternary true false }}
             }
         }
     },
@@ -98,7 +99,7 @@
                     "port": 6969,
                     "userName": "${API_USER}",
                     "password": "${API_PASSWORD}",
-                    "useHttps": true
+                    "useHttps": {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }}
                 },
                 "papParameters": {
                     "clientName": "policy-pap",
@@ -106,7 +107,7 @@
                     "port": 6969,
                     "userName": "${PAP_USER}",
                     "password": "${PAP_PASSWORD}",
-                    "useHttps": true
+                    "useHttps": {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }}
                 },
                 "deployPolicies": true
              }
-- 
cgit 1.2.3-korg