Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 17 commits into from
Oct 25, 2014
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
122e6e5
serverspec2.0 added and consul_ui test fixed
goncalopereira Oct 15, 2014
ed1b0d9
cleaning up .gitignore
goncalopereira Oct 15, 2014
014ee8f
clean up gitignore
goncalopereira Oct 15, 2014
d451e81
GOMAXPROCS used through sysconfig
goncalopereira Oct 15, 2014
6204a44
Best Practice - Force Chef to setup number of CPUs
goncalopereira Oct 15, 2014
b8da19a
Sysconfig triggers init.d template not the service
goncalopereira Oct 15, 2014
0310f61
remove unused .gitignore2 file
goncalopereira Oct 16, 2014
0563c53
Init environment setup
goncalopereira Oct 16, 2014
9b9f536
moving cpu total variable into template instead of variables
goncalopereira Oct 17, 2014
13c69d8
serverspec2.0 added and consul_ui test fixed
goncalopereira Oct 15, 2014
b2d3a05
GOMAXPROCS used through sysconfig
goncalopereira Oct 17, 2014
44f7e36
merging upstream
goncalopereira Oct 17, 2014
05db45f
Merge remote-tracking branch 'upstream/master'
goncalopereira Oct 17, 2014
68e4382
fix merge
goncalopereira Oct 17, 2014
daf164f
merge fix again
goncalopereira Oct 17, 2014
3c9b497
allow GOMAXPROCS to always use CPU Information, no default
Oct 24, 2014
6adbdcf
Merge remote-tracking branch 'upstream/master'
Oct 24, 2014
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion attributes/default.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions recipes/_service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 8 additions & 0 deletions spec/unit/recipes/_service_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
6 changes: 6 additions & 0 deletions spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
require 'serverspec'
set :backend, :exec

RSpec.configure do |c|
c.path = '/usr/local/bin:/sbin:/bin:/usr/bin'
end
6 changes: 6 additions & 0 deletions templates/default/consul-init.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
1 change: 1 addition & 0 deletions templates/default/consul-sysconfig.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
GOMAXPROCS=<%= node['cpu']['total'] %>
2 changes: 0 additions & 2 deletions test/integration/default/serverspec/spec_helper.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
require 'serverspec'

set :backend, :exec

RSpec.configure do |c|
c.path = '/usr/local/bin:/sbin:/bin:/usr/bin'
end
2 changes: 1 addition & 1 deletion test/integration/ui/serverspec/localhost/consul_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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

This comment was marked as outdated.

Sign in to view

This comment was marked as outdated.

Sign in to view

it { should be_file }
end

Expand Down