From ae66f946c806ee8031c938cdc171d195a64c8cab Mon Sep 17 00:00:00 2001
From: Michael Hwang <mhwang@research.att.com>
Date: Thu, 5 Apr 2018 23:50:26 -0400
Subject: Add new required sch config parameter

"msgBusAddress"

Change-Id: I609bc95ac1f05a6a8d4c9ba7281ca21c54d54861
Issue-ID: DCAEGEN2-431
Signed-off-by: Michael Hwang <mhwang@research.att.com>
---
 blueprints/inventory.yaml-template     | 31 +++++++++++++++++--------------
 blueprints/k8s-inventory.yaml-template | 31 +++++++++++++++++--------------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/blueprints/inventory.yaml-template b/blueprints/inventory.yaml-template
index 079fb9d..142eec8 100644
--- a/blueprints/inventory.yaml-template
+++ b/blueprints/inventory.yaml-template
@@ -38,21 +38,23 @@ inputs:
 
   docker_host_override:
     description: Target docker host to deploy applications to
-  asdc_address:
+  sdc_address:
     description: SDC host
-  asdc_uri:
+  sdc_uri:
     description: SDC url
-  asdc_user:
+  sdc_msg_bus_address:
+    description: Message router hostname that SDC will send distribution events through
+  sdc_user:
     description: SDC username
-  asdc_password:
+  sdc_password:
     description: SDC password
-  asdc_environment_name:
+  sdc_environment_name:
     description: SDC environment name
-  asdc_use_secure_https:
+  sdc_use_secure_https:
     description: Boolean to toggle whether to do certificate validation for https calls to SDC API
     type: boolean
     default: false
-  asdc_use_https_dmaap:
+  sdc_use_https_dmaap:
     description: Boolean to toggle whether to use https for calls to message router API
     type: boolean
     default: false
@@ -76,19 +78,20 @@ node_templates:
         "service-change-handler"
       application_config:
         asdcDistributionClient:
-          asdcAddress: { get_input: asdc_address }
-          asdcUri: { get_input: asdc_uri }
-          user: { get_input: asdc_user }
-          password: { get_input: asdc_password }
+          asdcAddress: { get_input: sdc_address }
+          asdcUri: { get_input: sdc_uri }
+          msgBusAddress: { get_input: sdc_msg_bus_address }
+          user: { get_input: sdc_user }
+          password: { get_input: sdc_password }
           pollingInterval: 20
           pollingTimeout: 20
           consumerGroup: dcae
           consumerId: dcae-sch
-          environmentName: { get_input: asdc_environment_name }
+          environmentName: { get_input: sdc_environment_name }
           keyStorePath:
           keyStorePassword:
-          activateServerTLSAuth: { get_input: asdc_use_secure_https }
-          useHttpsWithDmaap: { get_input: asdc_use_https_dmaap }
+          activateServerTLSAuth: { get_input: sdc_use_secure_https }
+          useHttpsWithDmaap: { get_input: sdc_use_https_dmaap }
           isFilterInEmptyResources: false
         dcaeInventoryClient:
           uri: http://inventory:8080
diff --git a/blueprints/k8s-inventory.yaml-template b/blueprints/k8s-inventory.yaml-template
index ca22800..87c9053 100644
--- a/blueprints/k8s-inventory.yaml-template
+++ b/blueprints/k8s-inventory.yaml-template
@@ -32,21 +32,23 @@ imports:
 
 inputs:
 
-  asdc_address:
+  sdc_address:
     description: SDC host
-  asdc_uri:
+  sdc_uri:
     description: SDC url
-  asdc_user:
+  sdc_msg_bus_address:
+    description: Message router hostname that SDC will send distribution events through
+  sdc_user:
     description: SDC username
-  asdc_password:
+  sdc_password:
     description: SDC password
-  asdc_environment_name:
+  sdc_environment_name:
     description: SDC environment name
-  asdc_use_secure_https:
+  sdc_use_secure_https:
     description: Boolean to toggle whether to do certificate validation for https calls to SDC API
     type: boolean
     default: false
-  asdc_use_https_dmaap:
+  sdc_use_https_dmaap:
     description: Boolean to toggle whether to use https for calls to message router API
     type: boolean
     default: false
@@ -70,19 +72,20 @@ node_templates:
         "service-change-handler"
       application_config:
         asdcDistributionClient:
-          asdcAddress: { get_input: asdc_address }
-          asdcUri: { get_input: asdc_uri }
-          user: { get_input: asdc_user }
-          password: { get_input: asdc_password }
+          asdcAddress: { get_input: sdc_address }
+          asdcUri: { get_input: sdc_uri }
+          msgBusAddress: { get_input: sdc_msg_bus_address }
+          user: { get_input: sdc_user }
+          password: { get_input: sdc_password }
           pollingInterval: 20
           pollingTimeout: 20
           consumerGroup: dcae
           consumerId: dcae-sch
-          environmentName: { get_input: asdc_environment_name }
+          environmentName: { get_input: sdc_environment_name }
           keyStorePath:
           keyStorePassword:
-          activateServerTLSAuth: { get_input: asdc_use_secure_https }
-          useHttpsWithDmaap: { get_input: asdc_use_https_dmaap }
+          activateServerTLSAuth: { get_input: sdc_use_secure_https }
+          useHttpsWithDmaap: { get_input: sdc_use_https_dmaap }
           isFilterInEmptyResources: false
         dcaeInventoryClient:
           uri: http://inventory:8080
-- 
cgit 1.2.3-korg