equal
deleted
inserted
replaced
1 Add support for degraded state in smf and remove unused variable stime. |
1 Add support for degraded state in smf and remove unused variable stime. |
2 Submitted upstream as PUP-6095 |
2 Submitted upstream as PUP-6095 |
3 |
3 |
4 diff --git a/lib/puppet/provider/service/smf.rb b/lib/puppet/provider/service/smf.rb |
4 --- puppet-3.8.6/lib/puppet/provider/service/smf.rb.orig 2016-04-19 14:56:32.596751150 -0700 |
5 --- a/lib/puppet/provider/service/smf.rb |
5 +++ puppet-3.8.6/lib/puppet/provider/service/smf.rb 2016-04-19 14:59:32.495860166 -0700 |
6 +++ b/lib/puppet/provider/service/smf.rb |
6 @@ -36,11 +36,12 @@ |
7 @@ -32,11 +32,12 @@ |
|
8 end |
7 end |
9 |
8 |
10 def self.instances |
9 def self.instances |
11 - svcs("-H").split("\n").select{|l| l !~ /^legacy_run/ }.collect do |line| |
10 - svcs("-H").split("\n").select{|l| l !~ /^legacy_run/ }.collect do |line| |
12 - state,stime,fmri = line.split(/\s+/) |
11 - state,stime,fmri = line.split(/\s+/) |
13 + svcs("-H", "-o", "state,fmri" ).split("\n").select{|l| l !~ /^legacy_run/ }.collect do |line| |
12 + svcs("-H", "-o", "state,fmri" ).split("\n").select{|l| l !~ /^legacy_run/ }.collect do |line| |
14 + state,fmri = line.split(/\s+/) |
13 + state,fmri = line.split(/\s+/) |
17 when /maintenance/; :maintenance |
16 when /maintenance/; :maintenance |
18 + when /degraded/; :degraded |
17 + when /degraded/; :degraded |
19 else :stopped |
18 else :stopped |
20 end |
19 end |
21 new({:name => fmri, :ensure => status}) |
20 new({:name => fmri, :ensure => status}) |
22 @@ -67,7 +68,7 @@ |
21 @@ -71,7 +72,7 @@ |
23 def startcmd |
22 def startcmd |
24 self.setupservice |
23 self.setupservice |
25 case self.status |
24 case self.status |
26 - when :maintenance |
25 - when :maintenance |
27 + when :maintenance, :degraded |
26 + when :maintenance, :degraded |
28 [command(:adm), :clear, @resource[:name]] |
27 [command(:adm), :clear, @resource[:name]] |
29 else |
28 else |
30 [command(:adm), :enable, "-rs", @resource[:name]] |
29 [command(:adm), :enable, "-rs", @resource[:name]] |
31 @@ -108,6 +109,8 @@ |
30 @@ -112,6 +113,8 @@ |
32 return :stopped |
31 return :stopped |
33 when "maintenance" |
32 when "maintenance" |
34 return :maintenance |
33 return :maintenance |
35 + when "degraded" |
34 + when "degraded" |
36 + return :degraded |
35 + return :degraded |