Populate vnc_api_lib.ini on compute nodes with OpenContrail

[apex-tripleo-heat-templates.git] / puppet / cinder-storage.yaml

diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index ef3f08f..699a096 100644 (file)
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -30,14 +30,6 @@ parameters:
     default: default
     description: Name of an existing Nova key pair to enable SSH access to the instances
     type: string
-  SnmpdReadonlyUserName:
-    default: ro_snmp_user
-    description: The user name for SNMPd with readonly rights running on all Overcloud nodes
-    type: string
-  SnmpdReadonlyUserPassword:
-    description: The user password for SNMPd with readonly rights running on all Overcloud nodes
-    type: string
-    hidden: true
   UpdateIdentifier:
     default: ''
     type: string
@@ -92,6 +84,9 @@ parameters:
   ServiceNames:
     type: comma_delimited_list
     default: []
+  MonitoringSubscriptions:
+    type: comma_delimited_list
+    default: []
   ConfigCommand:
     type: string
     description: Command which will be run whenever configuration data changes
@@ -232,8 +227,6 @@ resources:
       server: {get_resource: BlockStorage}
       config: {get_resource: BlockStorageConfig}
       input_values:
-        snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
-        snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
         enable_package_upgrade: {get_attr: [UpdateDeployment, update_managed_packages]}
 
   # Map heat metadata into hiera datafiles
@@ -251,13 +244,16 @@ resources:
             - service_names
             - service_configs
             - volume
+            - bootstrap_node # provided by allNodesConfig
             - all_nodes # provided by allNodesConfig
+            - vip_data # provided by allNodesConfig
             - '"%{::osfamily}"'
           merge_behavior: deeper
           datafiles:
             service_names:
               mapped_data:
                 service_names: {get_param: ServiceNames}
+                sensu::subscriptions: {get_param: MonitoringSubscriptions}
             service_configs:
               mapped_data:
                 map_replace:
@@ -270,8 +266,6 @@ resources:
             volume:
               mapped_data:
                 tripleo::packages::enable_upgrade: {get_input: enable_package_upgrade}
-                snmpd_readonly_user_name: {get_input: snmpd_readonly_user_name}
-                snmpd_readonly_user_password: {get_input: snmpd_readonly_user_password}
 
   # Resource for site-specific injection of root certificate
   NodeTLSCAData: