From: Yanis Guenane <yanis.guenane@enovance.com>
Date: Wed, 18 Mar 2015 14:54:45 +0000 (+0100)
Subject: controller-puppet: Honor MysqlRootPassword
X-Git-Tag: opnfv-6.0.0~2640^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=fae3cb25686ed1325472fa3d648c1bb0a984ee91;p=apex-tripleo-heat-templates.git

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

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}