Includes Network Discovery Ctx Builder URL

The fix is to include the URL for Network Discovery Context Builder in the
parent chart so that it can be used by both context aggregator and
network discovery context builder.

Change-Id: I21be5acc21677659f512ba872657ccf7433bdfb2
Signed-off-by: Prudence Au <prudence.au@amdocs.com>
Issue-ID: LOG-700

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 aa80aed..f07cb65 100755 (executable)
--- 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 905ea87..9535a7e 100755 (executable)
--- 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 f84906e..5317ab3 100644 (file)
--- 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 f0acaa5..04e89f0 100644 (file)
--- 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: