Merge pull request #791 from roidelapluie/empty-string-as-parameter

Re-Add the ability to set a empty string as option parameter

Author: igalic

spec/classes/mycnf_template_spec.rb

@@ -29,6 +29,11 @@
           end
         end
 
+        describe 'skip-name-resolve set to an empty string' do
+          let(:params) {{ :override_options => { 'mysqld' => { 'skip-name-resolve' => '' }}}}
+          it { is_expected.to contain_file('mysql-config-file').with_content(/^skip-name-resolve$/) }
+        end
+
         describe 'ssl set to true' do
           let(:params) {{ :override_options => { 'mysqld' => { 'ssl' => true }}}}
           it { is_expected.to contain_file('mysql-config-file').with_content(/ssl/) }

templates/my.cnf.erb

@@ -6,7 +6,7 @@
 <%     v.sort.map do |ki, vi| -%>
 <%       if ki == 'ssl-disable' or (ki =~ /^ssl/ and v['ssl-disable'] == true) -%>
 <%         next %>
-<%       elsif vi == true or v == '' -%>
+<%       elsif vi == true or vi == '' -%>
 <%=        ki %>
 <%       elsif vi.is_a?(Array) -%>
 <%         vi.each do |vii| -%>