From a68f4cb5db47f41deac439b9ef90065e023af3fe Mon Sep 17 00:00:00 2001 From: jmac Date: Thu, 10 May 2018 22:44:19 +0000 Subject: General cleanup of SDNC charts Addressing issues like: - missing property files - hard-coded ports - hard-coded ODL passwords - improper configMap mounts - incorrect service names Change-Id: I74726ffedbfc20e164a814ca8777a699b92b3d65 Signed-off-by: jmac Issue-ID: SDNC-310 --- .../sdnc-portal/resources/config/admportal.json | 2 +- .../sdnc-portal/resources/config/dblib.properties | 32 ++++++++++++++++++++++ .../config/svclogic.properties.sdnctldb01 | 5 ---- 3 files changed, 33 insertions(+), 6 deletions(-) create mode 100644 kubernetes/sdnc/charts/sdnc-portal/resources/config/dblib.properties delete mode 100644 kubernetes/sdnc/charts/sdnc-portal/resources/config/svclogic.properties.sdnctldb01 (limited to 'kubernetes/sdnc/charts/sdnc-portal/resources/config') diff --git a/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json b/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json index 3e873214b4..f6d202ef09 100644 --- a/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json +++ b/kubernetes/sdnc/charts/sdnc-portal/resources/config/admportal.json @@ -44,7 +44,7 @@ "odlPort": "8181", "odlConexusPort": "8181", "odlUser": "admin", - "odlPasswd": "admin", + "odlPasswd": "{{.Values.config.odlPassword}}", "ConexusNetwork_sslCert": "", "ConexusNetwork_sslKey": "", "AppNetwork_sslCert": "", diff --git a/kubernetes/sdnc/charts/sdnc-portal/resources/config/dblib.properties b/kubernetes/sdnc/charts/sdnc-portal/resources/config/dblib.properties new file mode 100644 index 0000000000..9e4c88a879 --- /dev/null +++ b/kubernetes/sdnc/charts/sdnc-portal/resources/config/dblib.properties @@ -0,0 +1,32 @@ +### +# ============LICENSE_START======================================================= +# Copyright (C) 2018 ONAP 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========================================================= +### +org.onap.ccsdk.sli.dbtype=jdbc +org.onap.ccsdk.sli.jdbc.hosts=sdnctldb01 +org.onap.ccsdk.sli.jdbc.url=jdbc:mysql://{{.Values.mysql.service.name}}.{{.Release.Namespace}}:{{.Values.mysql.service.internalPort}}/sdnctl +org.onap.ccsdk.sli.jdbc.driver=org.mariadb.jdbc.Driver +org.onap.ccsdk.sli.jdbc.database=sdnctl +org.onap.ccsdk.sli.jdbc.user=sdnctl +org.onap.ccsdk.sli.jdbc.password=gamma +org.onap.ccsdk.sli.jdbc.connection.name=sdnctldb01 +org.onap.ccsdk.sli.jdbc.connection.timeout=50 +org.onap.ccsdk.sli.jdbc.request.timeout=100 +org.onap.ccsdk.sli.jdbc.limit.init=10 +org.onap.ccsdk.sli.jdbc.limit.min=10 +org.onap.ccsdk.sli.jdbc.limit.max=20 +org.onap.dblib.connection.recovery=false diff --git a/kubernetes/sdnc/charts/sdnc-portal/resources/config/svclogic.properties.sdnctldb01 b/kubernetes/sdnc/charts/sdnc-portal/resources/config/svclogic.properties.sdnctldb01 deleted file mode 100644 index e0e3295735..0000000000 --- a/kubernetes/sdnc/charts/sdnc-portal/resources/config/svclogic.properties.sdnctldb01 +++ /dev/null @@ -1,5 +0,0 @@ -org.openecomp.sdnctl.sli.dbtype = jdbc -org.openecomp.sdnctl.sli.jdbc.url = jdbc:mysql://sdnc-sdnctldb01:3306/sdnctl -org.openecomp.sdnctl.sli.jdbc.database = sdnctl -org.openecomp.sdnctl.sli.jdbc.user = sdnctl -org.openecomp.sdnctl.sli.jdbc.password = gamma \ No newline at end of file -- cgit 1.2.3-korg