From: Borislav Glozman <Borislav.Glozman@amdocs.com>
Date: Wed, 23 May 2018 12:19:35 +0000 (+0000)
Subject: Merge "Correct Helm Chart for NBI"
X-Git-Tag: 2.0.0-ONAP~70
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=bf896ed510554481af92824aeb163b0066c5b9b4;hp=b0307658e4cfa8a2e7fca1c9fa8d090521e45ded;p=oom.git

Merge "Correct Helm Chart for NBI"
---

diff --git a/TOSCA/Helm/onap-blueprint.yaml b/TOSCA/Helm/onap-blueprint.yaml
index 3ac76fa8b1..c5b699b5be 100644
--- a/TOSCA/Helm/onap-blueprint.yaml
+++ b/TOSCA/Helm/onap-blueprint.yaml
@@ -347,3 +347,13 @@ node_templates:
     relationships:
       - type: cloudify.relationships.connected_to
         target: k8s_env
+
+  nbi:
+    type: cloudify.nodes.Helm
+    properties:
+      args:
+      - { get_input: namespace }
+      - nbi
+    relationships:
+      - type: cloudify.relationships.connected_to
+        target: k8s_env
\ No newline at end of file
diff --git a/kubernetes/clamp/values.yaml b/kubernetes/clamp/values.yaml
index 71752fcfc6..751e4a0c11 100644
--- a/kubernetes/clamp/values.yaml
+++ b/kubernetes/clamp/values.yaml
@@ -48,8 +48,8 @@ config:
         "clamp.config.sdc.serviceUsername": "clamp",
         "clamp.config.sdc.servicePassword": "b7acccda32b98c5bb7acccda32b98c5b05D511BD6D93626E90D18E9D24D9B78CD34C7EE8012F0A189A28763E82271E50A5D4EC10C7D93E06E0A2D27CAE66B981",
         "clamp.config.files.sdcController": "file:/opt/clamp/sdc-controllers-config.json",
-        "clamp.config.dcae.inventory.url": "http://dcaegen2.{{ include "common.namespace" . }}:8080",
-        "clamp.config.dcae.dispatcher.url": "http://dcaegen2.{{ include "common.namespace" . }}:8080",
+        "clamp.config.dcae.inventory.url": "http://inventory.{{ include "common.namespace" . }}:8080",
+        "clamp.config.dcae.dispatcher.url": "http://deployment-handler.{{ include "common.namespace" . }}:8443",
         "clamp.config.policy.pdpUrl1": "https://pdp.{{ include "common.namespace" . }}:9091/pdp/ , testpdp, alpha123",
         "clamp.config.policy.pdpUrl2": "https://pdp.{{ include "common.namespace" . }}:9091/pdp/ , testpdp, alpha123",
         "clamp.config.policy.papUrl": "https://pap.{{ include "common.namespace" . }}:8443/pap/ , testpap, alpha123",
diff --git a/kubernetes/onap/resources/environments/dev.yaml b/kubernetes/onap/resources/environments/dev.yaml
index 9b10012879..7a988a532f 100644
--- a/kubernetes/onap/resources/environments/dev.yaml
+++ b/kubernetes/onap/resources/environments/dev.yaml
@@ -78,6 +78,8 @@ msb:
   enabled: false
 multicloud:
   enabled: false
+nbi:
+  enabled: false
 policy:
   enabled: false
 portal:
diff --git a/kubernetes/onap/resources/environments/disable-allcharts.yaml b/kubernetes/onap/resources/environments/disable-allcharts.yaml
index 0f669beaab..8b66dab319 100644
--- a/kubernetes/onap/resources/environments/disable-allcharts.yaml
+++ b/kubernetes/onap/resources/environments/disable-allcharts.yaml
@@ -51,6 +51,8 @@ msb:
   enabled: false
 multicloud:
   enabled: false
+nbi:
+  enabled: false
 oof:
   enabled: false
 policy: