summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-03-19 12:31:42 +0000
committerGerrit Code Review <review@openstack.org>2015-03-19 12:31:42 +0000
commit3eb3134c2657ccbbb005746104327f53632f740e (patch)
tree249666e430c5582f95059d61fa4fb67eff6bee61
parentf3278b40d35bc2003abb8bbd0b7d3eb25025d435 (diff)
parentfae3cb25686ed1325472fa3d648c1bb0a984ee91 (diff)
Merge "controller-puppet: Honor MysqlRootPassword"
-rw-r--r--puppet/controller-puppet.yaml2
1 files changed, 1 insertions, 1 deletions
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 0c623aaf..4385bbc1 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -695,7 +695,7 @@ resources:
# MySQL
admin_password: {get_input: admin_password}
mysql_innodb_buffer_pool_size: {get_input: mysql_innodb_buffer_pool_size}
- mysql_root_password: {get_input: mysql_root_password}
+ mysql::server::root_password: {get_input: mysql_root_password}
mysql_cluster_name: {get_input: mysql_cluster_name}
# Neutron
neutron::bind_host: {get_input: controller_host}