summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-10-21 21:00:23 +0000
committerGerrit Code Review <review@openstack.org>2016-10-21 21:00:23 +0000
commit774ad60314433118d2e25ebf7713d880c1b412d7 (patch)
tree153921f2c8202863cf44815c11a70911fafbf9eb /puppet/services
parentf4ec754a4df333af597cc44208c3cc7114b47969 (diff)
parent9d9eecea56b15f6f96f9d33def8045afb6527051 (diff)
Merge "Prefill Sensu client custom config"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/monitoring/sensu-client.yaml17
1 files changed, 16 insertions, 1 deletions
diff --git a/puppet/services/monitoring/sensu-client.yaml b/puppet/services/monitoring/sensu-client.yaml
index 3f37e750..a26c7458 100644
--- a/puppet/services/monitoring/sensu-client.yaml
+++ b/puppet/services/monitoring/sensu-client.yaml
@@ -18,6 +18,13 @@ parameters:
Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
+ AdminPassword:
+ description: Keystone admin user password
+ type: string
+ KeystoneRegion:
+ default: 'regionOne'
+ description: Keystone region for endpoint
+ type: string
SensuClientCustomConfig:
default: {}
description: Hash containing custom sensu-client variables.
@@ -44,6 +51,14 @@ outputs:
- sensu::api: false
sensu::client: true
sensu::server: false
- sensu::client_custom: {get_param: SensuClientCustomConfig}
+ sensu::client_custom:
+ map_merge:
+ - {get_param: SensuClientCustomConfig}
+ - openstack:
+ username: 'admin'
+ password: {get_param: AdminPassword}
+ auth_url: {get_param: [EndpointMap, KeystoneInternal, uri]}
+ tenant_name: 'admin'
+ region: {get_param: KeystoneRegion}
step_config: |
include ::tripleo::profile::base::monitoring::sensu