summaryrefslogtreecommitdiffstats
path: root/puppet/controller-puppet.yaml
diff options
context:
space:
mode:
authorYanis Guenane <yanis.guenane@enovance.com>2015-03-18 15:54:45 +0100
committerYanis Guenane <yanis.guenane@enovance.com>2015-03-18 15:54:45 +0100
commitfae3cb25686ed1325472fa3d648c1bb0a984ee91 (patch)
tree3498a3a8c261c29523355a9b2354428d1c666fd2 /puppet/controller-puppet.yaml
parent29327cd0902cc88229c693b44449f03bf88e911f (diff)
controller-puppet: Honor MysqlRootPassword
Currently the MysqlRootPassword parameter is retrieved from the templates but not honored, preventing a user to specify it. This commit fixes that. Change-Id: Ib6842736a37aea3cc16f1a7c75fc877408682bf7
Diffstat (limited to 'puppet/controller-puppet.yaml')
-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 76e5483a..a13942e9 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -672,7 +672,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}