Merge "Refactor iscsi initiator-name reset into separate service"

[apex-tripleo-heat-templates.git] / puppet / services / monitoring / sensu-base.yaml

diff --git a/puppet/services/monitoring/sensu-base.yaml b/puppet/services/monitoring/sensu-base.yaml
index 2fa1569..0f0fe95 100644 (file)
--- a/puppet/services/monitoring/sensu-base.yaml
+++ b/puppet/services/monitoring/sensu-base.yaml
@@ -1,8 +1,12 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: Sensu base service
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -17,6 +21,14 @@ parameters:
   DefaultPasswords:
     default: {}
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
   MonitoringRabbitHost:
     description: RabbitMQ host Sensu has to connect to.
     type: string
@@ -32,7 +44,7 @@ parameters:
         to the RabbitMQ host. Set MonitoringRabbitUseSSL to true without
         specifying a private key or cert chain to use SSL transport,
         but not cert auth.
-    type: string
+    type: boolean
   MonitoringRabbitSSLPrivateKey:
     default: ''
     description: Private key to be used by Sensu to connect to RabbitMQ host.