Revert template change + rubocop changes

Author: Jethro van Ginkel

spec/classes/mysql_server_spec.rb

@@ -98,19 +98,17 @@
           it { is_expected.to contain_file('/tmp/error.log') }
         end
         context 'default bind-address' do
-          let(:params) {  }
-
-          it { is_expected.to contain_file('mysql-config-file').with_content(/^bind-address = 127.0.0.1/) }
+          it { is_expected.to contain_file('mysql-config-file').with_content(%r{^bind-address = 127.0.0.1}) }
         end
         context 'with defined bind-address' do
           let(:params) { { override_options: { 'mysqld' => { 'bind-address' => '1.1.1.1' } } } }
 
-          it { is_expected.to contain_file('mysql-config-file').with_content(/^bind-address = 1.1.1.1/) }
+          it { is_expected.to contain_file('mysql-config-file').with_content(%r{^bind-address = 1.1.1.1}) }
         end
         context 'without bind-address' do
           let(:params) { { override_options: { 'mysqld' => { 'bind-address' => :undef } } } }
 
-          it { is_expected.to contain_file('mysql-config-file').without_content(/^bind-address/) }
+          it { is_expected.to contain_file('mysql-config-file').without_content(%r{^bind-address}) }
         end
       end
 

templates/my.cnf.erb

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