| author | Patrick Einheber <patrick.einheber@oracle.com> |
| Wed, 27 Apr 2016 14:55:10 -0700 | |
| changeset 5860 | afd31ba91ee9 |
| parent 2081 | 1f1144fb0e4e |
| permissions | -rw-r--r-- |
|
2081
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
1 |
Oracle customization - non upstream patch |
|
1198
f9a4100102d8
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
Add Solaris 12 to the pkg(5) pkg provider |
|
f9a4100102d8
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
3 |
|
|
5860
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
2081
diff
changeset
|
4 |
--- puppet-3.8.6/lib/puppet/provider/package/pkg.rb.orig 2016-04-19 13:58:08.682627507 -0700 |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
2081
diff
changeset
|
5 |
+++ puppet-3.8.6/lib/puppet/provider/package/pkg.rb 2016-04-19 14:01:27.178984250 -0700 |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
2081
diff
changeset
|
6 |
@@ -1,3 +1,7 @@ |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
2081
diff
changeset
|
7 |
+####################################################################### |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
2081
diff
changeset
|
8 |
+# Oracle has modified the originally distributed contents of this file. |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
2081
diff
changeset
|
9 |
+####################################################################### |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
2081
diff
changeset
|
10 |
+ |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
2081
diff
changeset
|
11 |
require 'puppet/provider/package' |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
2081
diff
changeset
|
12 |
|
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
2081
diff
changeset
|
13 |
Puppet::Type.type(:package).provide :pkg, :parent => Puppet::Provider::Package do |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
2081
diff
changeset
|
14 |
@@ -23,7 +27,7 @@ |
|
1198
f9a4100102d8
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
15 |
|
|
f9a4100102d8
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
confine :osfamily => :solaris |
|
f9a4100102d8
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
|
|
f9a4100102d8
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
18 |
- defaultfor :osfamily => :solaris, :kernelrelease => '5.11' |
|
f9a4100102d8
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
19 |
+ defaultfor :osfamily => :solaris, :kernelrelease => ['5.11', '5.12'] |
|
f9a4100102d8
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
20 |
|
|
f9a4100102d8
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
21 |
def self.instances |
|
f9a4100102d8
PSARC/2013/005 Puppet 3.0.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
22 |
pkg(:list, '-H').split("\n").map{|l| new(parse_line(l))}
|
|
5860
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
2081
diff
changeset
|
23 |