diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-14 23:11:34 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-14 23:11:34 +0000 |
| commit | 07a5fe1ba66cbad5afafbbd30d2d78129cb90bae (patch) | |
| tree | 1baecf44304a0c4a6459a1011312abfe65e6e5fd /puppet/services/monitoring | |
| parent | 66e1d882505a3335e290d1943a2d2b15909fd73f (diff) | |
| parent | baf6eee5016fac7004a7b8be6f78d4505f347aeb (diff) | |
Merge "Adds network/cidr mapping into a new service property"
Diffstat (limited to 'puppet/services/monitoring')
| -rw-r--r-- | puppet/services/monitoring/sensu-base.yaml | 4 | ||||
| -rw-r--r-- | puppet/services/monitoring/sensu-client.yaml | 5 |
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} |