summaryrefslogtreecommitdiffstats
path: root/kubernetes/sdnc
diff options
context:
space:
mode:
authorjmac <james.macnider@amdocs.com>2018-04-27 15:28:47 +0000
committerjmac <james.macnider@amdocs.com>2018-04-27 19:34:09 +0000
commitcaeb6e02dbe8858691371125f96388df8a1ad886 (patch)
tree8ff4102559131d04500ee9b5aa889ceccb818de2 /kubernetes/sdnc
parent880fa5c26aab08e504a887e2659828693c2b12fd (diff)
Fix for UEB connectivity to SDC
A new property was added in Beijing to connect to SDC, so this needed to be added to ueb-listener.properties While investigating, I also noticed that dblib.properties wasn't being properly configured, so I fixed that as well. Added init dependencies on the dmaap and sdc-be pods. Change-Id: I40b36c7333d511aeaa03e51cd9fadc8dc10956ac Signed-off-by: jmac <james.macnider@amdocs.com> Issue-ID: CCSDK-254
Diffstat (limited to 'kubernetes/sdnc')
-rw-r--r--kubernetes/sdnc/charts/ueb-listener/resources/config/dblib.properties37
-rw-r--r--kubernetes/sdnc/charts/ueb-listener/resources/config/ueb-listener.properties1
-rw-r--r--kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml4
-rw-r--r--kubernetes/sdnc/charts/ueb-listener/values.yaml9
-rw-r--r--kubernetes/sdnc/resources/config/conf/dblib.properties2
5 files changed, 51 insertions, 2 deletions
diff --git a/kubernetes/sdnc/charts/ueb-listener/resources/config/dblib.properties b/kubernetes/sdnc/charts/ueb-listener/resources/config/dblib.properties
new file mode 100644
index 0000000000..15cb2182a2
--- /dev/null
+++ b/kubernetes/sdnc/charts/ueb-listener/resources/config/dblib.properties
@@ -0,0 +1,37 @@
+###
+# ============LICENSE_START=======================================================
+# openECOMP : SDN-C
+# ================================================================================
+# 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=========================================================
+###
+
+# dblib.properties
+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/ueb-listener/resources/config/ueb-listener.properties b/kubernetes/sdnc/charts/ueb-listener/resources/config/ueb-listener.properties
index 72dee15938..cd184bfc32 100644
--- a/kubernetes/sdnc/charts/ueb-listener/resources/config/ueb-listener.properties
+++ b/kubernetes/sdnc/charts/ueb-listener/resources/config/ueb-listener.properties
@@ -19,3 +19,4 @@ org.onap.ccsdk.sli.northbound.uebclient.keystore-path=
org.onap.ccsdk.sli.northbound.uebclient.keystore-password=
org.onap.ccsdk.sli.northbound.uebclient.xslt-path-list=
org.onap.ccsdk.sli.northbound.uebclient.artifact-map=/opt/onap/sdnc/data/properties/artifact.map
+org.onap.ccsdk.sli.northbound.uebclient.msg-bus-address=message-router.{{.Release.Namespace}}
diff --git a/kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml b/kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml
index b11cf95277..e3f324e046 100644
--- a/kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml
+++ b/kubernetes/sdnc/charts/ueb-listener/templates/deployment.yaml
@@ -38,6 +38,10 @@ spec:
- {{ .Values.config.mysqlChartName }}
- --container-name
- {{ .Values.config.sdncChartName }}
+ - --container-name
+ - {{ .Values.config.sdcbeChartName }}
+ - --container-name
+ - {{ .Values.config.msgRouterContainerName }}
env:
- name: NAMESPACE
valueFrom:
diff --git a/kubernetes/sdnc/charts/ueb-listener/values.yaml b/kubernetes/sdnc/charts/ueb-listener/values.yaml
index d04ba099ff..a6722eb056 100644
--- a/kubernetes/sdnc/charts/ueb-listener/values.yaml
+++ b/kubernetes/sdnc/charts/ueb-listener/values.yaml
@@ -39,6 +39,8 @@ config:
uebPort: 3904
mysqlChartName: sdnc-dbhost
sdncChartName: sdnc
+ sdcbeChartName: sdc-be
+ msgRouterContainerName: dmaap
configDir: /opt/onap/sdnc/data/properties
@@ -62,7 +64,12 @@ readiness:
periodSeconds: 10
service:
- name: ueb-listener
+ name: sdnc-ueb-listener
+
+mysql:
+ service:
+ name: sdnc-dbhost
+ internalPort: 3306
ingress:
enabled: false
diff --git a/kubernetes/sdnc/resources/config/conf/dblib.properties b/kubernetes/sdnc/resources/config/conf/dblib.properties
index 499834e0e2..15cb2182a2 100644
--- a/kubernetes/sdnc/resources/config/conf/dblib.properties
+++ b/kubernetes/sdnc/resources/config/conf/dblib.properties
@@ -19,7 +19,7 @@
# ============LICENSE_END=========================================================
###
-# dblib.properrties
+# dblib.properties
org.onap.ccsdk.sli.dbtype=jdbc
org.onap.ccsdk.sli.jdbc.hosts=sdnctldb01