Merge branch '2793-consul-servers-cannot-run-consul-commands-by-default' into 'master'

Resolve "Consul servers cannot run consul commands by default"

Closes #2793

See merge request !1952

files/gitlab-cookbooks/consul/recipes/enable.rb

@@ -42,12 +42,6 @@ end
   end
 end
-# By default consul only listens on the loopback interface.
-# If we're running in server mode then this is not useful
-if node['consul']['configuration']['server']
-  node.default['consul']['configuration']['client_addr'] = node['ipaddress'] unless node['consul']['configuration'].attribute?('client_addr')
-end
-
 file "#{node['consul']['dir']}/config.json" do
   content consul_helper.configuration
   owner account_helper.consul_user

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

@@ -85,10 +85,6 @@ describe 'consul' do
           expect(content).to match(%r{"bootstrap_expect":3})
         }
       end
-
-      it 'sets client_addr when it has not been set' do
-        expect(chef_run).to render_file(consul_conf).with_content(%r{"client_addr":"10.0.0.2"})
-      end
     end
   end