Merge pull request #52 from goncalopereira/master

GOMAXPROCS picks number of CPUs using sysconfig - Also updated Serverspec to 2.0

attributes/default.rb

@@ -55,4 +55,4 @@
 # UI attributes
 default['consul']['client_addr'] = '0.0.0.0'
 default['consul']['ui_dir'] = '/var/lib/consul/ui'
-default['consul']['serve_ui'] = false
+default['consul']['serve_ui'] = false

recipes/_service.rb

@@ -131,6 +131,11 @@
 
 case node['consul']['init_style']
 when 'init'
+  template '/etc/sysconfig/consul' do
+    source 'consul-sysconfig.erb'
+    mode 0755
+    notifies :create, 'template[/etc/init.d/consul]', :immediately
+  end
   template '/etc/init.d/consul' do
     source 'consul-init.erb'
     mode 0755

spec/unit/recipes/_service_spec.rb

@@ -18,6 +18,14 @@
         .with(group: 'root')
         .with(mode: 0600)
     end
+    it do
+      expect(chef_run).to create_template('/etc/sysconfig/consul')
+        .with(source: 'consul-sysconfig.erb')
+        .with(mode: 0755)
+    end
+    it do
+      expect(chef_run).to render_file('/etc/sysconfig/consul').with_content('GOMAXPROCS=1')
+    end
     it do
       expect(chef_run).to create_template('/etc/init.d/consul')
         .with(source: 'consul-init.erb')

spec_helper.rb

@@ -0,0 +1,6 @@
+require 'serverspec'
+set :backend, :exec
+
+RSpec.configure do |c|
+  c.path = '/usr/local/bin:/sbin:/bin:/usr/bin'
+end

templates/default/consul-init.erb

@@ -14,6 +14,12 @@
 #                       * Multi Datacenter
 ### END INIT INFO
 
+if [ -f /etc/sysconfig/consul ]; then
+. /etc/sysconfig/consul
+fi
+
+export GOMAXPROCS=${GOMAXPROCS}
+
 CMD="<%= @consul_binary %> agent -config-dir <%= @config_dir %>"
 NAME="consul"
 

templates/default/consul-sysconfig.erb

@@ -0,0 +1 @@
+GOMAXPROCS=<%= node['cpu']['total'] %>

test/integration/default/serverspec/spec_helper.rb

@@ -1,7 +1,5 @@
 require 'serverspec'
 
-set :backend, :exec
-
 RSpec.configure do |c|
   c.path = '/usr/local/bin:/sbin:/bin:/usr/bin'
 end

test/integration/ui/serverspec/localhost/consul_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe file('/var/lib/consul/ui/index.html') do
+describe file('/var/lib/consul/ui/consul_ui/index.html') do
   it { should be_file }
 end