Merge branch 'int-bootstrap-expect' into 'master'

Switch the bootstrap_expect config for consul to be an int

Closes #2769

See merge request !1922

files/gitlab-cookbooks/consul/libraries/consul_helper.rb

@@ -13,7 +13,7 @@ class ConsulHelper
       'server' => false
     }
     @default_server_configuration = {
-      'bootstrap_expect' => '3'
+      'bootstrap_expect' => 3
     }
   end

spec/chef/gitlab-ee/recipes/consul_spec.rb

@@ -55,7 +55,7 @@ describe 'consul' do
       it 'does not include server default values in its configuration' do
         expect(chef_run).to render_file(consul_conf).with_content { |content|
-          expect(content).not_to match(%r{"bootstrap_expect":"3"})
+          expect(content).not_to match(%r{"bootstrap_expect":3})
         }
       end
@@ -82,7 +82,7 @@ describe 'consul' do
         expect(chef_run.node['consul']['configuration']['server']).to eq true
         expect(chef_run).to render_file(consul_conf).with_content { |content|
           expect(content).to match(%r{"server":true})
-          expect(content).to match(%r{"bootstrap_expect":"3"})
+          expect(content).to match(%r{"bootstrap_expect":3})
         }
       end