From f06c4cc2e76d3765df3d6f3a723682cc1a1d635b Mon Sep 17 00:00:00 2001 From: ehautot Date: Thu, 12 Apr 2018 11:36:07 +0200 Subject: [PATCH] Improve policy Config fix for docker-compose Change-Id: I3786f9e3a235831eb14efa5e154720ac84348ce2 Signed-off-by: ehautot Issue-ID: CLAMP-136 --- extra/docker/clamp/clamp.env | 2 +- ...clds-policy-config-third_party_proxy.properties | 37 ---------------------- 2 files changed, 1 insertion(+), 38 deletions(-) delete mode 100644 extra/docker/clamp/config/clds-policy-config-third_party_proxy.properties diff --git a/extra/docker/clamp/clamp.env b/extra/docker/clamp/clamp.env index 729941a0..fee3152e 100644 --- a/extra/docker/clamp/clamp.env +++ b/extra/docker/clamp/clamp.env @@ -1,2 +1,2 @@ ### Be careful, this must be in one line only ### -SPRING_APPLICATION_JSON={"spring.datasource.cldsdb.url":"jdbc:mariadb:sequential://db:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3","clamp.config.files.sdcController":"classpath:/clds/sdc-controllers-config.json","clamp.config.files.cldsPolicyConfig":"classpath:/clds/clds-policy-config.properties"} \ No newline at end of file +SPRING_APPLICATION_JSON={"spring.datasource.cldsdb.url":"jdbc:mariadb:sequential://db:3306/cldsdb4?autoReconnect=true&connectTimeout=10000&socketTimeout=10000&retriesAllDown=3"} \ No newline at end of file diff --git a/extra/docker/clamp/config/clds-policy-config-third_party_proxy.properties b/extra/docker/clamp/config/clds-policy-config-third_party_proxy.properties deleted file mode 100644 index ecf21e65..00000000 --- a/extra/docker/clamp/config/clds-policy-config-third_party_proxy.properties +++ /dev/null @@ -1,37 +0,0 @@ -### -# ============LICENSE_START======================================================= -# ONAP CLAMP -# ================================================================================ -# Copyright (C) 2017 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============================================ -# =================================================================== -# ECOMP is a trademark and service mark of AT&T Intellectual Property. -### - -# Configuration Settings for Policy Engine Components -PDP_URL1=http://third_party_proxy:8085/pdp/ , testpdp, alpha123 -PDP_URL2=http://third_party_proxy:8085/pdp/ , testpdp, alpha123 -NOTIFICATION_TYPE=websocket -NOTIFICATION_UEB_SERVERS=localhost -NOTIFICATION_TOPIC= -CLIENT_ID=python -# base64 encoding -#CLIENT_KEY=ChlakDuk -CLIENT_KEY=dGVzdA== -#DEVL for development -#TEST for Test environments -#PROD for prod environments -ENVIRONMENT=TEST -- 2.16.6