summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kubernetes/holmes/Chart.yaml2
-rw-r--r--kubernetes/holmes/values.yaml1
-rw-r--r--kubernetes/sdnc/resources/config/conf/mountpoint-registrar.properties21
-rw-r--r--kubernetes/sdnc/values.yaml7
4 files changed, 24 insertions, 7 deletions
diff --git a/kubernetes/holmes/Chart.yaml b/kubernetes/holmes/Chart.yaml
index 971d81c614..8f8e91d47f 100644
--- a/kubernetes/holmes/Chart.yaml
+++ b/kubernetes/holmes/Chart.yaml
@@ -34,7 +34,7 @@ dependencies:
- name: postgres-init
version: ~12.x-0
repository: '@local'
- condition: not global.postgres.localCluster
+ condition: global.postgres.globalCluster
- name: holmes-rule-mgmt
version: ~12.x-0
repository: 'file://components/holmes-rule-mgmt'
diff --git a/kubernetes/holmes/values.yaml b/kubernetes/holmes/values.yaml
index e8eb53d140..75521062f4 100644
--- a/kubernetes/holmes/values.yaml
+++ b/kubernetes/holmes/values.yaml
@@ -23,6 +23,7 @@ global:
#Override it to dbc-pg if localCluster is enabled.
postgres:
localCluster: false
+ globalCluster: true
service:
name: pgset
name2: &postgres tcp-pgset-primary
diff --git a/kubernetes/sdnc/resources/config/conf/mountpoint-registrar.properties b/kubernetes/sdnc/resources/config/conf/mountpoint-registrar.properties
index 51cb9be56f..71a9f78f94 100644
--- a/kubernetes/sdnc/resources/config/conf/mountpoint-registrar.properties
+++ b/kubernetes/sdnc/resources/config/conf/mountpoint-registrar.properties
@@ -1,6 +1,6 @@
[general]
dmaapEnabled={{.Values.config.sdnr.mountpointRegistrarEnabled | default "false"}}
-baseUrl=http://localhost:{{.Values.service.internalPort}}
+baseUrl=http://{{.Values.service.name}}.{{.Release.Namespace}}:{{.Values.service.internalPort}}
sdnrUser=${ODL_ADMIN_USERNAME}
sdnrPasswd=${ODL_ADMIN_PASSWORD}
@@ -37,3 +37,22 @@ contenttype=application/json
group=myG
id=C1
limit=10000
+
+[provisioning]
+username=${DMAAP_CM_TOPIC_USERNAME}
+password=${DMAAP_CM_TOPIC_PASSWORD}
+topic=unauthenticated.SEC_3GPP_PROVISIONING_OUTPUT
+TransportType=HTTPNOAUTH
+Protocol=http
+host=message-router.{{.Release.Namespace}}:{{.Values.config.dmaapPort | default "3904"}}
+contenttype=application/json
+group=myG
+id=C1
+timeout=20000
+limit=10000
+fetchPause=5000
+jersey.config.client.readTimeout=25000
+jersey.config.client.connectTimeout=25000
+jersey.config.client.proxy.username=${HTTP_PROXY_USERNAME}
+jersey.config.client.proxy.password=${HTTP_PROXY_PASSWORD}
+jersey.config.client.proxy.uri=${HTTP_PROXY_URI} \ No newline at end of file
diff --git a/kubernetes/sdnc/values.yaml b/kubernetes/sdnc/values.yaml
index 36cde48cc1..f02bc0b3b0 100644
--- a/kubernetes/sdnc/values.yaml
+++ b/kubernetes/sdnc/values.yaml
@@ -470,10 +470,7 @@ dgbuilder:
service:
- baseaddr: "sdnc-dgbuilder-ui"
name: "sdnc-dgbuilder"
- port: 3000
- - baseaddr: "sdnc-web-service-api"
- name: "sdnc-web-service"
- port: 8080
+ port: 3100
config:
ssl: "redirect"
@@ -581,7 +578,7 @@ ingress:
name: "sdnc"
port: 8282
- baseaddr: "sdnc-callhome"
- name: "onap-sdnc-callhome"
+ name: "sdnc-callhome"
port: *chport
protocol: tcp
exposedPort: *chport