author | Drew Fisher <drew.fisher@oracle.com> |
Tue, 21 May 2013 09:30:36 -0600 | |
branch | s11-update |
changeset 2629 | 3666f503c6e7 |
permissions | -rw-r--r-- |
2629
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
1 |
Enables puppet provider basic functionality with Solaris 11 zones. Also fixes a bug that |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
was introduced with the putback of 15886 into the puppet gate that prevented |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
3 |
zones networking from being created. |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
4 |
--- puppet-3.0.1/lib/puppet/provider/zone/solaris.rb.orig 2013-02-15 15:00:38.925896083 -0700 |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
5 |
+++ puppet-3.0.1/lib/puppet/provider/zone/solaris.rb 2013-02-15 15:00:48.805231725 -0700 |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
6 |
@@ -31,7 +31,7 @@ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
7 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
8 |
def multi_conf(name, should, &action) |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
9 |
has = properties[name] |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
10 |
- has = [] if has == :absent |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
11 |
+ has = [] if has == :absent or has.nil? |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
12 |
rms = has - should |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
13 |
adds = should - has |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
14 |
(rms.map{|o| action.call(:rm,o)} + adds.map{|o| action.call(:add,o)}).join("\n") |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
15 |
@@ -60,12 +60,36 @@ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
18 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
19 |
+ def self.def_net_prop(var, &conf) |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
20 |
+ define_method(var.to_s) do |v| |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
21 |
+ o = properties[var] |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
22 |
+ return '' if o.nil? or o == :absent |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
23 |
+ o.join(' ') |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
24 |
+ end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
25 |
+ define_method('%s_conf'% var.to_s) do |v| |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
26 |
+ multi_conf(var, v, &conf) |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
27 |
+ end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
28 |
+ end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
29 |
+ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
30 |
def_prop :iptype, "set ip-type=%s" |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
31 |
def_prop :autoboot, "set autoboot=%s" |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
32 |
def_prop :path, "set zonepath=%s" |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
33 |
def_prop :pool, "set pool=%s" |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
34 |
def_prop :shares, "add rctl\nset name=zone.cpu-shares\nadd value (priv=privileged,limit=%s,action=none)\nend" |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
35 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
36 |
+ if ['5.11', '5.12'].include? Facter.value(:kernelrelease) |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
37 |
+ def_net_prop :net_resource do |action, str| |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
38 |
+ case action |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
39 |
+ when :add |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
40 |
+ cmd = [" add anet"] |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
41 |
+ cmd << "end" |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
42 |
+ cmd.join("\n") |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
43 |
+ when :rm |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
44 |
+ " remove anet" |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
45 |
+ end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
46 |
+ end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
47 |
+ end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
48 |
+ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
49 |
def_multiprop :ip do |action, str| |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
50 |
interface, ip, defrouter = str.split(':') |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
51 |
case action |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
52 |
@@ -96,20 +120,27 @@ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
53 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
54 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
55 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
56 |
- def_multiprop :inherit do |action, str| |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
57 |
- case action |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
58 |
- when :add; ['add inherit-pkg-dir', "set dir=#{str}",'end'].join("\n") |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
59 |
- when :rm; "remove inherit-pkg-dir dir=#{str}" |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
60 |
- else self.fail action |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
61 |
+ if ['5.10'].include? Facter.value(:kernelrelease) |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
62 |
+ def_multiprop :inherit do |action, str| |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
63 |
+ case action |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
64 |
+ when :add; ['add inherit-pkg-dir', "set dir=#{str}",'end'].join("\n") |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
65 |
+ when :rm; "remove inherit-pkg-dir dir=#{str}" |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
66 |
+ else self.fail action |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
67 |
+ end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
68 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
69 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
70 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
71 |
def my_properties |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
72 |
- [:path, :iptype, :autoboot, :pool, :shares, :ip, :dataset, :inherit] |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
73 |
+ if ['5.11', '5.12'].include? Facter.value(:kernelrelease) |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
74 |
+ [:path, :iptype, :autoboot, :pool, :shares, :ip, :dataset, :net_resource] |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
75 |
+ elsif ['5.10'].include? Facter.value(:kernelrelease) |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
76 |
+ [:path, :iptype, :autoboot, :pool, :shares, :ip, :dataset, :inherit] |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
77 |
+ end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
78 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
79 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
80 |
# Perform all of our configuration steps. |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
81 |
def configure |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
82 |
+ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
83 |
self.fail "Path is required" unless @resource[:path] |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
84 |
arr = ["create -b #{@resource[:create_args]}"] |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
85 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
86 |
@@ -161,6 +192,14 @@ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
87 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
88 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
89 |
def install(dummy_argument=:work_arround_for_ruby_GC_bug) |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
90 |
+ if ['5.11', '5.12'].include? Facter.value(:kernelrelease) |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
91 |
+ if !@resource[:install_args] and @resource[:config_profile] |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
92 |
+ @resource[:install_args] = "-c " + @resource[:config_profile] |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
93 |
+ else |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
94 |
+ @resource[:install_args] << "-c " + @resource[:config_profile] |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
95 |
+ end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
96 |
+ end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
97 |
+ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
98 |
if @resource[:clone] # TODO: add support for "-s snapshot" |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
99 |
zoneadm :clone, @resource[:clone] |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
100 |
elsif @resource[:install_args] |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
101 |
@@ -183,6 +222,7 @@ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
102 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
103 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
104 |
@property_hash.dup |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
105 |
+ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
106 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
107 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
108 |
# We need a way to test whether a zone is in process. Our 'ensure' |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
109 |
@@ -253,6 +293,7 @@ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
110 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
111 |
def start |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
112 |
# Check the sysidcfg stuff |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
113 |
+ if ['5.10'].include? Facter.value(:kernelrelease) |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
114 |
if cfg = @resource[:sysidcfg] |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
115 |
self.fail "Path is required" unless @resource[:path] |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
116 |
zoneetc = File.join(@resource[:path], "root", "etc") |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
117 |
@@ -273,6 +314,7 @@ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
118 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
119 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
120 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
121 |
+ end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
122 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
123 |
zoneadm :boot |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
124 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
125 |
@@ -300,7 +342,11 @@ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
126 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
127 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
128 |
def stop |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
129 |
- zoneadm :halt |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
130 |
+ if ['5.10'].include? Facter.value(:kernelrelease) |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
131 |
+ execute_zoneadm :halt |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
132 |
+ elsif ['5.11', '5.12'].include? Facter.value(:kernelrelease) |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
133 |
+ zoneadm :shutdown |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
134 |
+ end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
135 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
136 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
137 |
def unconfigure |