diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-10-01 19:20:54 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-01 19:20:54 +0000 |
| commit | 233d82c9e41072804f59c0148a2fa3f494634932 (patch) | |
| tree | e5c3e61f368ef7495661c8e3efe6e0fba6d9408c /kubernetes/pomba | |
| parent | 90b7d266d28b053cb1f3d51859a8e025811d9b65 (diff) | |
| parent | 264ae438db0242724926725e5f00fb775d6b95b2 (diff) | |
Merge "Includes Network Discovery Ctx Builder URL"
Diffstat (limited to 'kubernetes/pomba')
4 files changed, 3 insertions, 2 deletions
diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties index aa80aed310..f07cb65c31 100755 --- a/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties +++ b/kubernetes/pomba/charts/pomba-contextaggregator/resources/config/builders/ndcb.properties @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -server.host={{ .Values.config.networkdiscoveryCtxBuilderHost }} +server.host={{ .Values.global.networkdiscoveryCtxBuilderHost }} basicauth.username={{ .Values.config.networkdiscoveryCtxBuilderUsername }} basicauth.password={{ .Values.config.networkdiscoveryCtxBuilderPassword }} server.port={{ .Values.config.ctxBuilderExternalPort }} diff --git a/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml b/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml index 905ea87efa..9535a7ebd5 100755 --- a/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml +++ b/kubernetes/pomba/charts/pomba-contextaggregator/values.yaml @@ -40,7 +40,6 @@ config: sdncCtxBuilderHost: pomba-sdncctxbuilder sdncCtxBuilderUsername: admin sdncCtxBuilderPassword: OBF:1u2a1toa1w8v1tok1u30 - networkdiscoveryCtxBuilderHost: pomba-networkdiscoveryctxbuilder networkdiscoveryCtxBuilderUsername: admin networkdiscoveryCtxBuilderPassword: OBF:1u2a1toa1w8v1tok1u30 ctxBuilderExternalPort: 9530 diff --git a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/application.properties b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/application.properties index f84906e9ef..5317ab353c 100644 --- a/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/application.properties +++ b/kubernetes/pomba/charts/pomba-networkdiscoveryctxbuilder/resources/config/application.properties @@ -31,6 +31,7 @@ server.tomcat.max-idle-time=60000 # Network Discovery Context Builder REST Service networkDiscoveryCtxBuilder.httpProtocol={{ .Values.config.networkDiscoveryCtxBuilderHttpProtocol }} +networkDiscoveryCtxBuilder.serviceName={{ .Values.global.networkdiscoveryCtxBuilderHost }} networkDiscoveryCtxBuilder.port={{ .Values.config.networkDiscoveryCtxBuilderPort }} # Basic Authorization credentials for Network Discovery Context Builder REST Service networkDiscoveryCtxBuilder.userId={{ .Values.config.networkDiscoveryCtxBuilderUserId }} diff --git a/kubernetes/pomba/values.yaml b/kubernetes/pomba/values.yaml index f0acaa5b88..04e89f07b3 100644 --- a/kubernetes/pomba/values.yaml +++ b/kubernetes/pomba/values.yaml @@ -22,6 +22,7 @@ global: loggingImage: beats/filebeat:5.5.0 repository: nexus3.onap.org:10001 dockerhubRepository: docker.io + networkdiscoveryCtxBuilderHost: pomba-networkdiscoveryctxbuilder # application configuration config: |