From 0a48eea0389b32ba0a622d01a6acdd4e660cff72 Mon Sep 17 00:00:00 2001
From: Jack Lucas <jflucas@research.att.com>
Date: Thu, 10 May 2018 20:50:54 +0000
Subject: Fix typo in policy handler registration

Also fix naming/namespacing for Cloudify Manager Consul registration.

Change-Id: Ie8d03651e4de2236d520be70b8c3170b03e9c97f
Issue-ID: DCAEGEN2-496
Signed-off-by: Jack Lucas <jflucas@research.att.com>
---
 k8s-bootstrap-container/bootstrap.sh | 7 +++++--
 k8s-bootstrap-container/pom.xml      | 2 +-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/k8s-bootstrap-container/bootstrap.sh b/k8s-bootstrap-container/bootstrap.sh
index f3e9b5d..edfd057 100755
--- a/k8s-bootstrap-container/bootstrap.sh
+++ b/k8s-bootstrap-container/bootstrap.sh
@@ -19,6 +19,8 @@
 # Expects:
 #   CM address (IP or DNS) in CMADDR environment variable
 #   CM password in CMPASS environment variable (assumes user is "admin")
+#   ONAP common Kubernetes namespace in ONAP_NAMESPACE environment variable
+#   If DCAE components are deployed in a separate Kubernetes namespace, that namespace in DCAE_NAMESPACE variable.
 #   Consul address with port in CONSUL variable
 #   Plugin wagon files in /wagons
 # 	Blueprints for components to be installed in /blueprints
@@ -30,12 +32,13 @@ set -ex
 # Consul service registration data
 CBS_REG='{"ID": "dcae-cbs0", "Name": "config_binding_service", "Address": "config-binding-service", "Port": 10000}'
 CBS_REG1='{"ID": "dcae-cbs1", "Name": "config-binding-service", "Address": "config-binding-service", "Port": 10000}'
-CM_REG='{"ID": "dcae-cm0", "Name": "cloudify_manager", "Address": "cloudify-manager.onap", "Port": 80}'
 INV_REG='{"ID": "dcae-inv0", "Name": "inventory", "Address": "inventory", "Port": 8080}'
+# Cloudify Manager will always be in the ONAP namespace.
+CM_REG='{"ID": "dcae-cm0", "Name": "cloudify_manager", "Port": 80, "Address": "dcae-cloudify-manager.'${ONAP_NAMESPACE}'"}'
 # Policy handler will be looked up from a plugin on CM.  If DCAE components are running in a different k8s
 # namespace than CM (which always runs in the common ONAP namespace), then the policy handler address must
 # be qualified with the DCAE namespace.
-PH_REG='{"ID": "dcae-ph0", "Name": "policy_handler", "Port": 25577, "Address: policy-handler'
+PH_REG='{"ID": "dcae-ph0", "Name": "policy_handler", "Port": 25577, "Address": "policy-handler'
 if [ ! -z "${DCAE_NAMESPACE}" ]
 then
 	PH_REG="${PH_REG}.${DCAE_NAMESPACE}"
diff --git a/k8s-bootstrap-container/pom.xml b/k8s-bootstrap-container/pom.xml
index 782577d..73c122b 100644
--- a/k8s-bootstrap-container/pom.xml
+++ b/k8s-bootstrap-container/pom.xml
@@ -27,7 +27,7 @@ limitations under the License.
   <groupId>org.onap.dcaegen2.deployments</groupId>
   <artifactId>k8s-bootstrap-container</artifactId>
   <name>dcaegen2-deployments-k8s-bootstrap-container</name>
-  <version>1.1.9</version>
+  <version>1.1.10</version>
   <url>http://maven.apache.org</url>
   <properties>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-- 
cgit 1.2.3-korg