summaryrefslogtreecommitdiffstats
path: root/puppet/services/monitoring
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2017-06-22 17:25:03 +0200
committerGiulio Fidente <gfidente@redhat.com>2017-07-14 13:44:04 +0200
commitbaf6eee5016fac7004a7b8be6f78d4505f347aeb (patch)
treec0c5504b60b0c234623f601a2ca34fd89c2080d2 /puppet/services/monitoring
parentaa5c511b827e4c3a7d6cd6021892648093427dbc (diff)
Adds network/cidr mapping into a new service property
Makes it possible to resolve network subnets within a service template; the data is transported into a new property ServiceData wired into every service which hopefully is generic enough to be extended in the future and transport more data. Data can be consumed in service templates to set config values which need to know what is the subnet where a deamon operates (for example the Ceph Public vs Cluster network). Change-Id: I28e21c46f1ef609517175f7e7ee19e28d1c0cba2
Diffstat (limited to 'puppet/services/monitoring')
-rw-r--r--puppet/services/monitoring/sensu-base.yaml4
-rw-r--r--puppet/services/monitoring/sensu-client.yaml5
2 files changed, 9 insertions, 0 deletions
diff --git a/puppet/services/monitoring/sensu-base.yaml b/puppet/services/monitoring/sensu-base.yaml
index 5e7e9940..24dda549 100644
--- a/puppet/services/monitoring/sensu-base.yaml
+++ b/puppet/services/monitoring/sensu-base.yaml
@@ -3,6 +3,10 @@ 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
diff --git a/puppet/services/monitoring/sensu-client.yaml b/puppet/services/monitoring/sensu-client.yaml
index 25e2b947..f2b062e0 100644
--- a/puppet/services/monitoring/sensu-client.yaml
+++ b/puppet/services/monitoring/sensu-client.yaml
@@ -3,6 +3,10 @@ heat_template_version: pike
description: Sensu client configured with Puppet
parameters:
+ ServiceData:
+ default: {}
+ description: Dictionary packing service data
+ type: json
ServiceNetMap:
default: {}
description: Mapping of service_name -> network name. Typically set
@@ -43,6 +47,7 @@ resources:
SensuBase:
type: ./sensu-base.yaml
properties:
+ ServiceData: {get_param: ServiceData}
ServiceNetMap: {get_param: ServiceNetMap}
DefaultPasswords: {get_param: DefaultPasswords}
EndpointMap: {get_param: EndpointMap}