author | Patrick Einheber <patrick.einheber@oracle.com> |
Wed, 27 Apr 2016 14:55:10 -0700 | |
changeset 5860 | afd31ba91ee9 |
parent 5591 | d29b325ec1b3 |
permissions | -rw-r--r-- |
5591
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
1 |
In-house patch to have the rabbitmq providers look in /usr/bin for |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
rabbitmqadmin instead of /usr/local/bin |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.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:
5591
diff
changeset
|
4 |
--- puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb.orig 2016-04-21 06:32:55.385984680 -0700 |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
5 |
+++ puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb 2016-04-21 06:37:14.452024943 -0700 |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
6 |
@@ -1,15 +1,19 @@ |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
7 |
+####################################################################### |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
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:
5591
diff
changeset
|
9 |
+####################################################################### |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
10 |
+ |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
11 |
require 'json' |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
12 |
require 'puppet' |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
13 |
Puppet::Type.type(:rabbitmq_binding).provide(:rabbitmqadmin) do |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
14 |
|
5591
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
15 |
if Puppet::PUPPETVERSION.to_f < 3 |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
commands :rabbitmqctl => 'rabbitmqctl' |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
- commands :rabbitmqadmin => '/usr/local/bin/rabbitmqadmin' |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
18 |
+ commands :rabbitmqadmin => '/usr/bin/rabbitmqadmin' |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
19 |
else |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
20 |
has_command(:rabbitmqctl, 'rabbitmqctl') do |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
21 |
environment :HOME => "/tmp" |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
22 |
end |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
23 |
- has_command(:rabbitmqadmin, '/usr/local/bin/rabbitmqadmin') do |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
24 |
+ has_command(:rabbitmqadmin, '/usr/bin/rabbitmqadmin') do |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
25 |
environment :HOME => "/tmp" |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
26 |
end |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
27 |
end |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
28 |
|
5860
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
29 |
--- puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb.orig 2016-04-21 06:33:00.401594316 -0700 |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
30 |
+++ puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb 2016-04-21 06:37:20.410206326 -0700 |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
31 |
@@ -1,15 +1,19 @@ |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
32 |
+####################################################################### |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
33 |
+# 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:
5591
diff
changeset
|
34 |
+####################################################################### |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
35 |
+ |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
36 |
require 'puppet' |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
37 |
require File.expand_path(File.join(File.dirname(__FILE__), '..', 'rabbitmqctl')) |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
38 |
Puppet::Type.type(:rabbitmq_exchange).provide(:rabbitmqadmin, :parent => Puppet::Provider::Rabbitmqctl) do |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
39 |
|
5591
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
40 |
if Puppet::PUPPETVERSION.to_f < 3 |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
41 |
commands :rabbitmqctl => 'rabbitmqctl' |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
42 |
- commands :rabbitmqadmin => '/usr/local/bin/rabbitmqadmin' |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
43 |
+ commands :rabbitmqadmin => '/usr/bin/rabbitmqadmin' |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
44 |
else |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
45 |
has_command(:rabbitmqctl, 'rabbitmqctl') do |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
46 |
environment :HOME => "/tmp" |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
47 |
end |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
48 |
- has_command(:rabbitmqadmin, '/usr/local/bin/rabbitmqadmin') do |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
49 |
+ has_command(:rabbitmqadmin, '/usr/bin/rabbitmqadmin') do |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
50 |
environment :HOME => "/tmp" |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
51 |
end |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
52 |
end |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
53 |
|
5860
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
54 |
--- puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_queue/rabbitmqadmin.rb.orig 2016-04-21 06:33:06.190244636 -0700 |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
55 |
+++ puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_queue/rabbitmqadmin.rb 2016-04-21 06:37:27.198708092 -0700 |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
56 |
@@ -1,15 +1,19 @@ |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
57 |
+####################################################################### |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
58 |
+# 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:
5591
diff
changeset
|
59 |
+####################################################################### |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
60 |
+ |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
61 |
require 'json' |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
62 |
require 'puppet' |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
63 |
Puppet::Type.type(:rabbitmq_queue).provide(:rabbitmqadmin) do |
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
64 |
|
5591
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
65 |
if Puppet::PUPPETVERSION.to_f < 3 |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
66 |
commands :rabbitmqctl => 'rabbitmqctl' |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
67 |
- commands :rabbitmqadmin => '/usr/local/bin/rabbitmqadmin' |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
68 |
+ commands :rabbitmqadmin => '/usr/bin/rabbitmqadmin' |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
69 |
else |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
70 |
has_command(:rabbitmqctl, 'rabbitmqctl') do |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
71 |
environment :HOME => "/tmp" |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
72 |
end |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
73 |
- has_command(:rabbitmqadmin, '/usr/local/bin/rabbitmqadmin') do |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
74 |
+ has_command(:rabbitmqadmin, '/usr/bin/rabbitmqadmin') do |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
75 |
environment :HOME => "/tmp" |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
76 |
end |
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
77 |
end |