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

@@ -130,6 +130,14 @@
 
 case node['consul']['init_style']
 when 'init'
+  template '/etc/sysconfig/consul' do
+    source 'consul-sysconfig.erb'
+    mode 0755
+    variables(
+      gomaxprocs: node['cpu']['total']
+    )
+    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,11 @@
         .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 create_template('/etc/init.d/consul')
         .with(source: 'consul-init.erb')

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:-2}
+
 CMD="<%= @consul_binary %> agent -config-dir <%= @config_dir %>"
 NAME="consul"
 

templates/default/consul-sysconfig.erb

@@ -0,0 +1 @@
+GOMAXPROCS=<%= @gomaxprocs %>

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

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe command('which consul') do
-  it { should return_exit_status 0 }
+  its(:exit_status) { should eq 0 }
   its(:stdout) { should match '/usr/local/bin/consul' }
 end
 
@@ -25,22 +25,22 @@
 end
 
 describe command 'consul members -detailed' do
-  it { should return_exit_status 0 }
-  it { should return_stdout %r{\balive\b} }
-  it { should return_stdout %r{\brole=consul\b} }
-  it { should return_stdout %r{\bbootstrap=1\b} }
+  its(:exit_status) { should eq 0 }
+  its(:stdout) { should match %r{\balive\b} }
+  its(:stdout) { should match %r{\brole=consul\b} }
+  its(:stdout) { should match %r{\bbootstrap=1\b}} 
 end
 
 describe 'config file attributes' do
   context command 'consul members -detailed' do
-    it { should return_stdout %r{\bdc=FortMeade\b} }
+      its(:stdout) { should match %r{\bdc=FortMeade\b}} 
   end
 end
 
 eth0_ip = command("/sbin/ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}'").stdout.strip
 describe command("grep #{eth0_ip} /etc/consul.d/default.json") do
-  it { should return_exit_status 0 }
+  its(:exit_status) { should eq 0 }
   # bind_addr should only be in the config if node[:consul][:bind_addr] is set
-  it { should return_stdout %r{"bind_addr":\s"#{eth0_ip}"}}
-  it { should return_stdout %r{"advertise_addr":\s"#{eth0_ip}"}}
+  its(:stdout) { should match %r{"bind_addr":\s"#{eth0_ip}"} }
+  its(:stdout) { should match %r{"advertise_addr":\s"#{eth0_ip}"} }
 end

test/integration/default/serverspec/spec_helper.rb

@@ -1,8 +1,3 @@
 require 'serverspec'
-
-include SpecInfra::Helper::Exec
-include SpecInfra::Helper::DetectOS
-
-RSpec.configure do |c|
-  c.path = '/usr/local/bin:/sbin:/bin:/usr/bin'
-end
+set :backend, :exec
+set :path, '/usr/local/bin:/bin:/sbin:/usb/sbin:$PATH'

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

@@ -1,11 +1,11 @@
 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
 
 eth0_ip = command("/sbin/ifconfig eth0 | grep 'inet addr:' | cut -d: -f2 | awk '{ print $1}'").stdout.strip
-describe command("wget -q -O- http://#{eth0_ip}:8500/ui/index.html") do
-  it { should return_exit_status 0 }
-  its(:stdout) { should == File.read('/var/lib/consul/ui/index.html') }
+describe command("wget -q -O- http://#{eth0_ip}:8500/ui/consul_ui/index.html") do
+  its(:exit_status) { should eq 0 }
+  its(:stdout) { should eq File.read('/var/lib/consul/ui/consul_ui/index.html') }
 end

test/integration/ui/serverspec/spec_helper.rb

@@ -1,16 +1,3 @@
-begin
-  require 'rspec/its'
-rescue LoadError
-  require 'rubygems/dependency_installer'
-  Gem::DependencyInstaller.new.install('rspec-its')
-  require 'rspec/its'
-end
-
 require 'serverspec'
-
-include SpecInfra::Helper::Exec
-include SpecInfra::Helper::DetectOS
-
-RSpec.configure do |c|
-  c.path = '/usr/local/bin:/sbin:/bin:/usr/bin'
-end
+set :backend, :exec
+set :path, '/usr/local/bin:/bin:/sbin:/usb/sbin:$PATH'