diff options
| author |   Andreas Geissler <andreas-geissler@telekom.de> | 2023-04-20 06:57:52 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2023-04-20 06:57:52 +0000 |
| commit | ab4477c2d1834303f3e6efbb647e36387399fc03 (patch) | |
| tree | 5dbc8d3c66306615473fe9aea0bbf1cb8e84a5fd /kubernetes | |
| parent | b1859e6c157ac996a6ee2404da877a7738e3741d (diff) | |
| parent | 1b174e56de13afad5312b2db0d9cecdb0d9c64ef (diff) | |
Merge "[SDNC] Correct baseUrl in mountpoint-registrar"
Diffstat (limited to 'kubernetes')
| -rw-r--r-- | kubernetes/sdnc/resources/config/conf/mountpoint-registrar.properties | 21 | ||||
| -rw-r--r-- | kubernetes/sdnc/values.yaml | 7 |
2 files changed, 22 insertions, 6 deletions
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 |