Skip to content
This repository was archived by the owner on Feb 18, 2020. It is now read-only.

Commit 236f6cd

Browse files
Explicitly specify provider to be systemd for ubuntu 16.04. (#112)
* Change metadata to include chef_version and license
1 parent 4d11df7 commit 236f6cd

File tree

4 files changed

+22
-18
lines changed

4 files changed

+22
-18
lines changed

Gemfile.lock

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@ GEM
66
i18n (~> 0.7)
77
minitest (~> 5.1)
88
tzinfo (~> 1.1)
9-
addressable (2.5.0)
9+
addressable (2.5.1)
1010
public_suffix (~> 2.0, >= 2.0.2)
11-
artifactory (2.7.0)
11+
artifactory (2.8.1)
1212
ast (2.3.0)
13-
aws-sdk (2.8.7)
14-
aws-sdk-resources (= 2.8.7)
15-
aws-sdk-core (2.8.7)
13+
aws-sdk (2.9.0)
14+
aws-sdk-resources (= 2.9.0)
15+
aws-sdk-core (2.9.0)
1616
aws-sigv4 (~> 1.0)
1717
jmespath (~> 1.0)
18-
aws-sdk-resources (2.8.7)
19-
aws-sdk-core (= 2.8.7)
18+
aws-sdk-resources (2.9.0)
19+
aws-sdk-core (= 2.9.0)
2020
aws-sigv4 (1.0.0)
2121
axiom-types (0.1.1)
2222
descendants_tracker (~> 0.0.4)
2323
ice_nine (~> 0.11.0)
2424
thread_safe (~> 0.3, >= 0.3.1)
25-
backports (3.6.8)
25+
backports (3.7.0)
2626
berkshelf (5.6.4)
2727
addressable (~> 2.3, >= 2.3.4)
2828
berkshelf-api-client (>= 2.0.2, < 4.0)
@@ -91,13 +91,13 @@ GEM
9191
fuzzyurl
9292
mixlib-config (~> 2.0)
9393
mixlib-shellout (~> 2.0)
94-
chef-zero (5.3.1)
94+
chef-zero (5.3.2)
9595
ffi-yajl (~> 2.2)
9696
hashie (>= 2.0, < 4.0)
9797
mixlib-log (~> 1.3)
9898
rack (~> 2.0)
9999
uuidtools (~> 2.1)
100-
chefspec (6.1.0)
100+
chefspec (6.2.0)
101101
chef (>= 12.0)
102102
fauxhai (>= 3.6, < 5)
103103
rspec (~> 3.0)
@@ -125,12 +125,12 @@ GEM
125125
excon (0.55.0)
126126
faraday (0.9.2)
127127
multipart-post (>= 1.2, < 3)
128-
fauxhai (4.0.1)
128+
fauxhai (4.1.0)
129129
net-ssh
130130
ffi (1.9.18)
131131
ffi-yajl (2.3.0)
132132
libyajl2 (~> 1.2)
133-
foodcritic (6.3.0)
133+
foodcritic (10.2.0)
134134
cucumber-core (>= 1.3)
135135
erubis
136136
nokogiri (>= 1.5, < 2.0)
@@ -140,7 +140,7 @@ GEM
140140
yajl-ruby (~> 1.1)
141141
formatador (0.2.5)
142142
fuzzyurl (0.9.0)
143-
gherkin (4.0.0)
143+
gherkin (4.1.1)
144144
gssapi (1.2.0)
145145
ffi (>= 1.0.1)
146146
guard (2.14.1)
@@ -153,8 +153,8 @@ GEM
153153
shellany (~> 0.0)
154154
thor (>= 0.18.1)
155155
guard-compat (1.2.1)
156-
guard-foodcritic (2.1.0)
157-
foodcritic (~> 6.0)
156+
guard-foodcritic (3.0.0)
157+
foodcritic (>= 8)
158158
guard (~> 2.12)
159159
guard-compat (~> 1.2)
160160
guard-rspec (4.7.3)
@@ -234,7 +234,7 @@ GEM
234234
net-ssh-gateway (>= 1.2.0)
235235
net-telnet (0.1.1)
236236
nio4r (2.0.0)
237-
nokogiri (1.7.0.1)
237+
nokogiri (1.7.1)
238238
mini_portile2 (~> 2.1.0)
239239
nori (2.6.0)
240240
notiffany (0.1.1)
@@ -338,7 +338,7 @@ GEM
338338
solve (3.1.0)
339339
molinillo (>= 0.5)
340340
semverse (>= 1.1, < 3.0)
341-
specinfra (2.67.2)
341+
specinfra (2.67.7)
342342
net-scp
343343
net-ssh (>= 2.7, < 5.0)
344344
net-telnet
@@ -359,7 +359,7 @@ GEM
359359
hitimes
360360
treetop (1.6.8)
361361
polyglot (~> 0.3)
362-
tzinfo (1.2.2)
362+
tzinfo (1.2.3)
363363
thread_safe (~> 0.1)
364364
unicode-display_width (1.1.3)
365365
uuidtools (2.1.5)

metadata.rb

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@
55
version '1.3.2'
66
source_url 'https://github.com/gocd-contrib/go-cookbook' if respond_to?(:source_url)
77
issues_url 'https://github.com/gocd-contrib/go-cookbook/issues' if respond_to?(:issues_url)
8+
chef_version '~> 12'
9+
license 'Apache v2.0'
810

911
supports 'ubuntu'
1012
supports 'centos'

recipes/server.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
end
77

88
service(platform?('windows') ? 'Go Server' : 'go-server') do
9+
provider Chef::Provider::Service::Systemd if platform?('ubuntu') && node['platform_version'].to_f >= 16.04
910
supports status: true, restart: true, start: true, stop: true
1011
action [:enable, :start]
1112
if node['gocd']['server']['wait_up']['retries'] != 0

resources/agent.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,7 @@
115115
case node['gocd']['agent']['type']
116116
when 'java'
117117
service agent_name do
118+
provider Chef::Provider::Service::Systemd if platform?('ubuntu') && node['platform_version'].to_f >= 16.04
118119
supports status: true, restart: autoregister_values[:daemon], start: true, stop: true
119120
action new_resource.service_action
120121
end

0 commit comments

Comments
 (0)