summaryrefslogtreecommitdiffstats
path: root/puppet/services
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-08-03 01:02:42 +0000
committerGerrit Code Review <review@openstack.org>2017-08-03 01:02:42 +0000
commitfd002f479a05840bd3acb15aa76bff2c666cc94c (patch)
treee2efcba5ac4b5b0fb354673c89ae95196b324a66 /puppet/services
parentfbccdd58bca9854a736088dcd73f0837aa400b61 (diff)
parentf04235c3ebec463c75dfbd7f989c3e1b0e075375 (diff)
Merge "Set redis password hiera value in compute agent"
Diffstat (limited to 'puppet/services')
-rw-r--r--puppet/services/ceilometer-agent-compute.yaml5
1 files changed, 5 insertions, 0 deletions
diff --git a/puppet/services/ceilometer-agent-compute.yaml b/puppet/services/ceilometer-agent-compute.yaml
index 3cf51519..27bc50f3 100644
--- a/puppet/services/ceilometer-agent-compute.yaml
+++ b/puppet/services/ceilometer-agent-compute.yaml
@@ -39,6 +39,10 @@ parameters:
type: string
constraints:
- allowed_values: ['naive', 'libvirt_metadata', 'workload_partitioning']
+ RedisPassword:
+ description: The password for the redis service account.
+ type: string
+ hidden: true
resources:
CeilometerServiceBase:
@@ -61,6 +65,7 @@ outputs:
map_merge:
- get_attr: [CeilometerServiceBase, role_data, config_settings]
- ceilometer::agent::compute::instance_discovery_method: {get_param: InstanceDiscoveryMethod}
+ - ceilometer_redis_password: {get_param: RedisPassword}
compute_namespace: true
service_config_settings:
get_attr: [CeilometerServiceBase, role_data, service_config_settings]