From: Mike Elliott <mike.elliott@amdocs.com>
Date: Wed, 4 Sep 2019 12:28:42 +0000 (+0000)
Subject: Merge "Removed exposed debug port 6000 in SDC"
X-Git-Tag: 5.0.1-ONAP~101
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=d885505b59b0330614391151213ce55acd195227;hp=c535c93ad2f230a646f891d2563f9e45758bc04c;p=oom.git

Merge "Removed exposed debug port 6000 in SDC"
---

diff --git a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties b/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
index 6cb952f460..c53b401bf9 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
+++ b/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
@@ -48,7 +48,7 @@ blueprintsprocessor.blueprintArchivePath=/opt/app/onap/blueprints/archive
 blueprintsprocessor.blueprintWorkingPath=/opt/app/onap/blueprints/work
 
 # Primary Database Configuration
-blueprintsprocessor.db.url=jdbc:mysql://db:3306/sdnctl
+blueprintsprocessor.db.url=jdbc:mysql://cds-db:3306/sdnctl
 blueprintsprocessor.db.username=sdnctl
 blueprintsprocessor.db.password=sdnctl
 blueprintsprocessor.db.driverClassName=org.mariadb.jdbc.Driver
@@ -91,7 +91,7 @@ blueprintsprocessor.restclient.config-data.password=Kp8bJ4SXszM0WXlhak3eHlcse2gA
 
 # AAI Data REST Client settings
 blueprintsprocessor.restclient.aai-data.type=basic-auth
-blueprintsprocessor.restclient.aai-data.url=https://aai.onap:8443
+blueprintsprocessor.restclient.aai-data.url=https://aai:8443
 blueprintsprocessor.restclient.aai-data.username=aai@aai.onap.org
 blueprintsprocessor.restclient.aai-data.password=demo123456!
 
@@ -101,7 +101,6 @@ blueprintsprocessor.messageclient.self-service-api.type=kafka-basic-auth
 
 ##ONAP Message Router Kafka Service##
 blueprintsprocessor.messageclient.self-service-api.bootstrapServers=message-router-kafka:9092
-
 blueprintsprocessor.messageclient.self-service-api.consumerTopic=cds-consumer
 blueprintsprocessor.messageclient.self-service-api.groupId=cds-consumer-group
 blueprintsprocessor.messageclient.self-service-api.clientId=cds-client
diff --git a/kubernetes/cds/charts/cds-blueprints-processor/values.yaml b/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
index 29eeb19477..03537e7106 100755
--- a/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
+++ b/kubernetes/cds/charts/cds-blueprints-processor/values.yaml
@@ -1,7 +1,5 @@
 # Copyright (c) 2019 IBM, Bell Canada
 #
-#  Modifications Copyright (c) 2019 Bell Canada.
-#
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
diff --git a/kubernetes/policy/charts/policy-xacml-pdp/resources/config/config.json b/kubernetes/policy/charts/policy-xacml-pdp/resources/config/config.json
index 5635c05efa..4483a1b51a 100644
--- a/kubernetes/policy/charts/policy-xacml-pdp/resources/config/config.json
+++ b/kubernetes/policy/charts/policy-xacml-pdp/resources/config/config.json
@@ -25,6 +25,14 @@
         "https": true,
         "aaf": false
     },
+    "policyApiParameters": {
+        "host": "policy-api",
+        "port": 6969,
+        "userName": "healthcheck",
+        "password": "zb!XztG34",
+        "https": true,
+        "aaf": false
+    },
     "applicationPath": "/opt/app/policy/pdpx/apps",
     "topicParameterGroup": {
         "topicSources" : [{
diff --git a/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml b/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml
index 32b8cdb18d..ce89cbf9d2 100644
--- a/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml
+++ b/kubernetes/sdc/charts/sdc-onboarding-be/values.yaml
@@ -36,7 +36,7 @@ pullPolicy: Always
 debugEnabled: false
 
 config:
-  javaOptions: "-Xdebug -agentlib:jdwp=transport=dt_socket,address=4001,server=y,suspend=n -Xmx1g -Xms1g"
+  javaOptions: "-Xmx1g -Xms1g"
   cassandraSslEnabled: "false"
 
 # default number of instances
diff --git a/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml b/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
index 639c811b08..09fe3291e0 100644
--- a/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
+++ b/kubernetes/sdc/charts/sdc-wfd-fe/values.yaml
@@ -35,7 +35,7 @@ pullPolicy: Always
 debugEnabled: false
 
 config:
-  javaOptions: "-Xdebug -agentlib:jdwp=transport=dt_socket,address=7000,server=y,suspend=n -Xmx256m -Xms256m"
+  javaOptions: "-Xmx256m -Xms256m"
   backendServerURL: "http://sdc-wfd-be:8080"
   isHttpsEnabled: true