From 5162183615cef85849cafaca6d9c9645bbf982ab Mon Sep 17 00:00:00 2001
From: "abhishek.kane" <abhishek.kane@veritas.com>
Date: Mon, 24 Jul 2017 14:43:32 +0530
Subject: [PATCH] Add parameters for Veritas HyperScale distributed setup.

Add more parameters to Veritas Hyperscale's composable service, which
will be relevant in distributed setup.

Change-Id: Ib1b90edbf17ea7f14bdbed4857241fca86b87a18
Signed-off-by: abhishek.kane <abhishek.kane@veritas.com>
---
 .../veritas-hyperscale-config.yaml                 |  7 ++++
 puppet/services/veritas-hyperscale-controller.yaml | 40 ++++++++++++++++++++--
 2 files changed, 45 insertions(+), 2 deletions(-)

diff --git a/environments/veritas-hyperscale/veritas-hyperscale-config.yaml b/environments/veritas-hyperscale/veritas-hyperscale-config.yaml
index 30fe399d..f6633539 100644
--- a/environments/veritas-hyperscale/veritas-hyperscale-config.yaml
+++ b/environments/veritas-hyperscale/veritas-hyperscale-config.yaml
@@ -22,3 +22,10 @@ parameter_defaults:
   VrtsRabbitPassword: ''
   VrtsKeystonePassword: ''
   VrtsMysqlPassword: ''
+  VrtsCtrlMgmtIP: ''
+  VrtsDashboardIP: ''
+  VrtsZookeeperIP: ''
+  VrtsSSHPassword: ''
+  VrtsConfigParam1: ''
+  VrtsConfigParam2: ''
+  VrtsConfigParam3: ''
diff --git a/puppet/services/veritas-hyperscale-controller.yaml b/puppet/services/veritas-hyperscale-controller.yaml
index bcb9e38f..fe641ad6 100644
--- a/puppet/services/veritas-hyperscale-controller.yaml
+++ b/puppet/services/veritas-hyperscale-controller.yaml
@@ -19,13 +19,41 @@ description: >
 parameters:
   VrtsRabbitPassword:
     type: string
-    default: ''
+    description: The Rabbitmq password of the hyperscale user. Mandatory.
   VrtsKeystonePassword:
     type: string
-    default: ''
+    description: The Keystone password of the hyperscale service. Mandatory.
   VrtsMysqlPassword:
+    type: string
+    description: The MySQL password of the hyperscale user. Mandatory.
+  VrtsCtrlMgmtIP:
+    type: string
+    default: ''
+    description: The management IP of HyperScale. The value will be inferred
+                 from the rest of the deployment settings if left blank.
+  VrtsDashboardIP:
+    type: string
+    default: ''
+    description: The dashboard IP of HyperScale. The value will be inferred
+                 from the rest of the deployment settings if left blank.
+  VrtsZookeeperIP:
+    type: string
+    description: The IP of a node where Zookeeper is configured. Mandatory.
+  VrtsSSHPassword:
+    type: string
+    description: The SSH password of the hyperscale user. Mandatory.
+  VrtsConfigParam1:
+    type: string
+    default: ''
+    description: Additional config parameter. Optional.
+  VrtsConfigParam2:
+    type: string
+    default: ''
+    description: Additional config parameter. Optional.
+  VrtsConfigParam3:
     type: string
     default: ''
+    description: Additional config parameter. Optional.
   ServiceData:
     default: {}
     description: Dictionary packing service data
@@ -59,6 +87,14 @@ outputs:
     value:
       service_name: veritas_hyperscale_controller
       config_settings:
+      global_config_settings:
+        vrts_ctrl_mgmt_ip: {get_param: VrtsCtrlMgmtIP}
+        vrts_dashboard_ip: {get_param: VrtsDashboardIP}
+        vrts_zookeeper_ip: {get_param: VrtsZookeeperIP}
+        vrts_ssh_passwd: {get_param: VrtsSSHPassword}
+        vrts_config_param1: {get_param: VrtsConfigParam1}
+        vrts_config_param2: {get_param: VrtsConfigParam2}
+        vrts_config_param3: {get_param: VrtsConfigParam3}
       step_config: |
         include ::veritas_hyperscale::controller_pkg_inst
       service_config_settings:
-- 
2.16.6