author | osayama <osamu.sayama@oracle.com> |
Fri, 16 Sep 2016 08:38:07 +0900 | |
changeset 6914 | 0c9c2d460328 |
parent 5728 | 19424f2daf9f |
child 7565 | 48aa82a0931f |
permissions | -rw-r--r-- |
5728
19424f2daf9f
22264785 Update Puppet to 3.8.6 in Solaris 12
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
2081
diff
changeset
|
1 |
--- puppet-3.8.3/lib/puppet/application/apply.rb.orig 2015-09-21 14:46:28.000000000 -0700 |
19424f2daf9f
22264785 Update Puppet to 3.8.6 in Solaris 12
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
2081
diff
changeset
|
2 |
+++ puppet-3.8.3/lib/puppet/application/apply.rb 2015-12-01 10:21:17.911069347 -0800 |
19424f2daf9f
22264785 Update Puppet to 3.8.6 in Solaris 12
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
2081
diff
changeset
|
3 |
@@ -1,6 +1,9 @@ |
1409
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
4 |
require 'puppet/application' |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
5 |
require 'puppet/configurer' |
5728
19424f2daf9f
22264785 Update Puppet to 3.8.6 in Solaris 12
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
2081
diff
changeset
|
6 |
require 'puppet/util/profiler/aggregate' |
1409
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
7 |
+if Facter.value(:osfamily) == "Solaris" |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
8 |
+ require 'PuppetAudit' |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
9 |
+end |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
10 |
|
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
11 |
class Puppet::Application::Apply < Puppet::Application |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
12 |
|
5728
19424f2daf9f
22264785 Update Puppet to 3.8.6 in Solaris 12
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
2081
diff
changeset
|
13 |
@@ -217,6 +220,12 @@ |
2081
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
14 |
end |
1409
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
15 |
|
2081
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
16 |
begin |
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
17 |
+ # configure auditing on Solaris |
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
18 |
+ if Facter.value(:osfamily) == "Solaris" |
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
19 |
+ audit_handle = PuppetAudit.new |
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
20 |
+ audit_handle.audit_start |
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
21 |
+ end |
1409
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
22 |
+ |
2081
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
23 |
# Compile our catalog |
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
24 |
starttime = Time.now |
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
25 |
catalog = Puppet::Resource::Catalog.indirection.find(node.name, :use_node => node) |
5728
19424f2daf9f
22264785 Update Puppet to 3.8.6 in Solaris 12
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
2081
diff
changeset
|
26 |
@@ -245,6 +254,12 @@ |
2081
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
27 |
rescue => detail |
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
28 |
Puppet.log_exception(detail) |
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
29 |
exit(1) |
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
30 |
+ ensure |
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
31 |
+ # clean up auditing records on Solaris |
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
32 |
+ if Facter.value(:osfamily) == "Solaris" |
1409
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
33 |
+ audit_handle.audit_stop |
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
34 |
+ audit_handle.audit_teardown |
2081
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
35 |
+ end |
1f1144fb0e4e
18960221 problem in UTILITY/PUPPET
Kristina Tripp <Kristina.Tripp@oracle.com>
parents:
1655
diff
changeset
|
36 |
end |
1409
9db4ba32e740
PSARC/2013/218 Puppet Phase 2
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
37 |
end |
5728
19424f2daf9f
22264785 Update Puppet to 3.8.6 in Solaris 12
Geoffrey Gardella <geoffrey.gardella@oracle.com>
parents:
2081
diff
changeset
|
38 |