Fix deprecation warnings at mysql template

diff --git a/templates/mysql.conf.erb b/templates/mysql.conf.erb
index ad47f153719c9fc6610a566892a40f54645e53e9..f14fadd33548ffbedcbfda3627f6ae17d6886590 100644 (file)
--- a/templates/mysql.conf.erb
+++ b/templates/mysql.conf.erb
@@ -3,11 +3,14 @@
 # the next time Puppet runs.  Please make configuration changes to this
 # service in Puppet.
 
-<% %w{user dbusername dbpassword dbhost databases backupdir vsname sqldumpoptions}.each do |v|
-       if send(v)
-               -%><%= v + ' = ' + send(v) + "\n" %><%
-       end
-end -%>
+<%= 'user = '+ @user if @user %>
+<%= 'dbusername = '+ @dbusername if @dbusername %>
+<%= 'dbpassword = '+ @dbpassword if @dbpassword %>
+<%= 'dbhost = '+ @dbhost if @dbhost %>
+<%= 'databases = '+ @databases if @databases %>
+<%= 'backupdir = '+ @backupdir if @backupdir %>
+<%= 'vsname = '+ @vsname if @vsname %>
+<%= 'sqldumpoptions = '+ @sqldumpoptions if @sqldumpoptions %>
 
 hotcopy = <%= @hotcopy ? 'yes' : 'no' %>
 sqldump = <%= @sqldump ? 'yes' : 'no' %>