Merge "controller-puppet: Honor MysqlRootPassword"

This commit is contained in:
Jenkins 2015-03-19 12:31:42 +00:00 committed by Gerrit Code Review
commit 3eb3134c26
1 changed files with 1 additions and 1 deletions

View File

@ -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}