summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-10-29 04:42:42 +0000
committerGerrit Code Review <review@openstack.org>2015-10-29 04:42:42 +0000
commitd9e24c15b1485ed7fe025b987f7fad75f1109454 (patch)
tree703f05884007251ba0505d58f1a00b49a5b82bee
parentbea428e8eb4ec4048d1f3a376b5971ac15949e7d (diff)
parent291735371f25432e4b75a4e13d5cfb2fd5ffbc86 (diff)
Merge "Fix password issue with mysql address for ceilometer"
-rw-r--r--puppet/controller.yaml4
1 files changed, 3 insertions, 1 deletions
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 0bb8035b..dc6c338d 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -885,7 +885,9 @@ resources:
ceilometer_dsn:
list_join:
- ''
- - - 'mysql://ceilometer:unset@'
+ - - 'mysql://ceilometer:'
+ - {get_param: CeilometerPassword}
+ - '@'
- {get_param: MysqlVirtualIP}
- '/ceilometer'
snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}