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 |
The puppet zone type changes that enable basic functionality with Solaris 11 |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
zones. Includes the type changes to fix a bug introduced by the putback of |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
3 |
15886 into the puppet gate that prevented zones networking from being created. |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
4 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
5 |
--- puppet-3.0.1/lib/puppet/type/zone.rb.orig 2013-02-15 16:08:16.530618507 -0700 |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
6 |
+++ puppet-3.0.1/lib/puppet/type/zone.rb 2013-02-15 08:24:18.530373776 -0700 |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
7 |
@@ -133,6 +133,12 @@ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
8 |
isnamevar |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
9 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
10 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
11 |
+ newparam(:config_profile) do |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
12 |
+ desc "Path to the config_profile to use for installation of a solaris zone. |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
13 |
+ This is set when providing a sysconfig profile instead of running the |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
14 |
+ sysconfig SCI tool on first boot of the zone." |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
15 |
+ end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
+ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
newparam(:id) do |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
18 |
desc "The numerical ID of the zone. This number is autogenerated |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
19 |
and cannot be changed." |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
20 |
@@ -161,19 +167,44 @@ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
21 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
22 |
# overridden so that we match with self.should |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
23 |
def insync?(is) |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
24 |
- return true unless is |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
25 |
- is = [] if is == :absent |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
26 |
+ is = [] if is == :absent or is.nil? |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
27 |
is.sort == self.should.sort |
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 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
30 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
31 |
newproperty(:iptype) do |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
32 |
- desc "The IP stack type of the zone." |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
33 |
- defaultto :shared |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
34 |
+ desc "The IP stack type of the zone. The default is to exclusive." |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
35 |
+ 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
|
36 |
+ defaultto :exclusive |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
37 |
+ else |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
38 |
+ defaultto :shared |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
39 |
+ end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
40 |
newvalue :shared |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
41 |
newvalue :exclusive |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
42 |
end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
43 |
|
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
44 |
+ newproperty(:net_resource, :parent => Puppet::Property::List) do |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
45 |
+ desc "The net resource assigned network resource to a zone. The net |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
46 |
+ resource represents the assignment of a physical network resource |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
47 |
+ to a zone. The anet resource represents the automatic creation of a |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
48 |
+ network resource for an exclusive-IP zone. This property only needs |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
49 |
+ to be set if additional network resources are desired. By default |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
50 |
+ an anet resource is created for the zone. To add additional net |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
51 |
+ or anet services" |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
52 |
+ newvalue :anet |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
53 |
+ newvalue :net |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
54 |
+ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
55 |
+ def should |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
56 |
+ @should |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
57 |
+ end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
58 |
+ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
59 |
+ # overridden so that we match with self.should |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
60 |
+ def insync?(is) |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
61 |
+ is = [] if is == :absent or is.nil? |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
62 |
+ is.sort == self.should.sort |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
63 |
+ end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
64 |
+ end |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
65 |
+ |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
66 |
newproperty(:autoboot, :boolean => true) do |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
67 |
desc "Whether the zone should automatically boot." |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
68 |
defaultto true |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
69 |
@@ -218,8 +249,7 @@ |
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 |
# overridden so that we match with self.should |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
72 |
def insync?(is) |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
73 |
- return true unless is |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
74 |
- is = [] if is == :absent |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
75 |
+ is = [] if is == :absent or is.nil? |
3666f503c6e7
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
76 |
is.sort == self.should.sort |
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 |