disable https server default for telemetry

Issue-ID: POLICY-3230
Signed-off-by: jhh <jorge.hernandez-herrero@att.com>
Change-Id: I2fd74011b649bca1acbef217bbf6ee222a6352eb

diff --git a/policy-management/src/main/server-gen/bin/rest-add-controller b/policy-management/src/main/server-gen/bin/rest-add-controller
deleted file mode 100644 (file)
index 28369ab..0000000
--- a/policy-management/src/main/server-gen/bin/rest-add-controller
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env sh
-
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# 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
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-
-source $POLICY_HOME/etc/profile.d/env.sh
-
-json=$1-controller.rest.json
-
-if [ -f "${json}" ]; then
-    if [ -n "${TELEMETRY_PASSWORD}" ]; then
-    curl -k --silent --user ${TELEMETRY_USER}:${TELEMETRY_PASSWORD} -X POST --data @${json} --header "Content-Type: application/json" \
-            https://localhost:${TELEMETRY_PORT}/policy/pdp/engine/controllers
-    else
-        curl -k --silent -X POST --data @${json} --header "Content-Type: application/json" \
-            https://localhost:${TELEMETRY_PORT}/policy/pdp/engine/controllers
-    fi
-else
-    echo "Usage: rest-add-controller.sh closed-loop-sample|reporter|sepc|vsegw|.. (or any other config file ending with *-controller.rest.json)"
-fi

diff --git a/policy-management/src/main/server-gen/bin/rest-delete-controller b/policy-management/src/main/server-gen/bin/rest-delete-controller
deleted file mode 100644 (file)
index 8782a8b..0000000
--- a/policy-management/src/main/server-gen/bin/rest-delete-controller
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/usr/bin/env sh
-
-# ============LICENSE_START=======================================================
-# ONAP
-# ================================================================================
-# Copyright (C) 2017-2021 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# 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
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-# ============LICENSE_END=========================================================
-
-source $POLICY_HOME/etc/profile.d/env.sh
-
-if [ -n "$1" ]; then
-    if [ -n "${TELEMETRY_PASSWORD}" ]; then
-        curl -k --silent --user ${TELEMETRY_USER}:${TELEMETRY_PASSWORD} -X DELETE --header "Content-Type: application/json" \
-            https://localhost:${TELEMETRY_PORT}/policy/pdp/engine/controllers/${1}
-    else
-        curl -k --silent -X DELETE --header "Content-Type: application/json" \
-            https://localhost:${TELEMETRY_PORT}/policy/pdp/engine/controllers/${1}
-    fi
-    echo
-    exit
-fi
-
-cat <<-'EOF'
-
-Usage: rest-delete-controller.sh closed-loop-sample|reporter|sepc|vsegw|.. (or any other controller idenfied by name)
-
-EOF

diff --git a/policy-management/src/main/server/config/engine-system.properties b/policy-management/src/main/server/config/engine-system.properties
index 722e7c2..a0313d0 100644 (file)
--- a/policy-management/src/main/server/config/engine-system.properties
+++ b/policy-management/src/main/server/config/engine-system.properties
@@ -33,9 +33,6 @@ com.sun.management.jmxremote.ssl=false
 javax.net.ssl.trustStore=${envd:TRUSTSTORE:/opt/app/policy/etc/ssl/policy-truststore}
 javax.net.ssl.trustStorePassword=${envd:TRUSTSTORE_PASSWD:Pol1cy_0nap}
 
-javax.net.ssl.keyStore=${envd:KEYSTORE:/opt/app/policy/etc/ssl/policy-keystore}
-javax.net.ssl.keyStorePassword=${envd:KEYSTORE_PASSWD:Pol1cy_0nap}
-
 # kie
 
 kie.maven.offline.force=${envd:REPOSITORY_OFFLINE:false}

diff --git a/policy-management/src/main/server/config/engine.properties b/policy-management/src/main/server/config/engine.properties
index de93b97..85a24f0 100644 (file)
--- a/policy-management/src/main/server/config/engine.properties
+++ b/policy-management/src/main/server/config/engine.properties
@@ -20,18 +20,18 @@
 
 # Policy Engine Telemetry Server
 
-http.server.services=SECURED-CONFIG
+http.server.services=CONFIG
 
-http.server.services.SECURED-CONFIG.host=${envd:TELEMETRY_HOST}
-http.server.services.SECURED-CONFIG.port=9696
-http.server.services.SECURED-CONFIG.userName=${envd:TELEMETRY_USER}
-http.server.services.SECURED-CONFIG.password=${envd:TELEMETRY_PASSWORD}
-http.server.services.SECURED-CONFIG.restPackages=org.onap.policy.drools.server.restful
-http.server.services.SECURED-CONFIG.managed=false
-http.server.services.SECURED-CONFIG.swagger=true
-http.server.services.SECURED-CONFIG.https=true
-http.server.services.SECURED-CONFIG.aaf=${envd:AAF:false}
-http.server.services.SECURED-CONFIG.serialization.provider=org.onap.policy.common.gson.JacksonHandler,org.onap.policy.common.endpoints.http.server.YamlJacksonHandler
+http.server.services.CONFIG.host=${envd:TELEMETRY_HOST}
+http.server.services.CONFIG.port=9696
+http.server.services.CONFIG.userName=${envd:TELEMETRY_USER}
+http.server.services.CONFIG.password=${envd:TELEMETRY_PASSWORD}
+http.server.services.CONFIG.restPackages=org.onap.policy.drools.server.restful
+http.server.services.CONFIG.managed=false
+http.server.services.CONFIG.swagger=true
+http.server.services.CONFIG.https=false
+http.server.services.CONFIG.aaf=${envd:AAF:false}
+http.server.services.CONFIG.serialization.provider=org.onap.policy.common.gson.JacksonHandler,org.onap.policy.common.endpoints.http.server.YamlJacksonHandler
 
 aaf.namespace=${envd:AAF_NAMESPACE:false}
 aaf.root.permission=${envd:AAF_NAMESPACE:org.onap.policy}.pdpd