1 In-house patch to have the rabbitmq providers look in /usr/bin for |
1 In-house patch to have the rabbitmq providers look in /usr/bin for |
2 rabbitmqadmin instead of /usr/local/bin |
2 rabbitmqadmin instead of /usr/local/bin |
3 |
3 |
4 --- puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb.orig 2015-11-20 07:01:01.498398940 -0800 |
4 --- puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb.orig 2016-04-21 06:32:55.385984680 -0700 |
5 +++ puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb 2015-11-20 07:01:14.230495648 -0800 |
5 +++ puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_binding/rabbitmqadmin.rb 2016-04-21 06:37:14.452024943 -0700 |
6 @@ -4,12 +4,12 @@ Puppet::Type.type(:rabbitmq_binding).pro |
6 @@ -1,15 +1,19 @@ |
7 |
7 +####################################################################### |
|
8 +# Oracle has modified the originally distributed contents of this file. |
|
9 +####################################################################### |
|
10 + |
|
11 require 'json' |
|
12 require 'puppet' |
|
13 Puppet::Type.type(:rabbitmq_binding).provide(:rabbitmqadmin) do |
|
14 |
8 if Puppet::PUPPETVERSION.to_f < 3 |
15 if Puppet::PUPPETVERSION.to_f < 3 |
9 commands :rabbitmqctl => 'rabbitmqctl' |
16 commands :rabbitmqctl => 'rabbitmqctl' |
10 - commands :rabbitmqadmin => '/usr/local/bin/rabbitmqadmin' |
17 - commands :rabbitmqadmin => '/usr/local/bin/rabbitmqadmin' |
11 + commands :rabbitmqadmin => '/usr/bin/rabbitmqadmin' |
18 + commands :rabbitmqadmin => '/usr/bin/rabbitmqadmin' |
12 else |
19 else |
17 + has_command(:rabbitmqadmin, '/usr/bin/rabbitmqadmin') do |
24 + has_command(:rabbitmqadmin, '/usr/bin/rabbitmqadmin') do |
18 environment :HOME => "/tmp" |
25 environment :HOME => "/tmp" |
19 end |
26 end |
20 end |
27 end |
21 |
28 |
22 --- puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb.orig 2015-11-20 07:29:19.574821579 -0800 |
29 --- puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb.orig 2016-04-21 06:33:00.401594316 -0700 |
23 +++ puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb 2015-11-20 07:29:25.845150783 -0800 |
30 +++ puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_exchange/rabbitmqadmin.rb 2016-04-21 06:37:20.410206326 -0700 |
24 @@ -4,12 +4,12 @@ Puppet::Type.type(:rabbitmq_exchange).pr |
31 @@ -1,15 +1,19 @@ |
25 |
32 +####################################################################### |
|
33 +# Oracle has modified the originally distributed contents of this file. |
|
34 +####################################################################### |
|
35 + |
|
36 require 'puppet' |
|
37 require File.expand_path(File.join(File.dirname(__FILE__), '..', 'rabbitmqctl')) |
|
38 Puppet::Type.type(:rabbitmq_exchange).provide(:rabbitmqadmin, :parent => Puppet::Provider::Rabbitmqctl) do |
|
39 |
26 if Puppet::PUPPETVERSION.to_f < 3 |
40 if Puppet::PUPPETVERSION.to_f < 3 |
27 commands :rabbitmqctl => 'rabbitmqctl' |
41 commands :rabbitmqctl => 'rabbitmqctl' |
28 - commands :rabbitmqadmin => '/usr/local/bin/rabbitmqadmin' |
42 - commands :rabbitmqadmin => '/usr/local/bin/rabbitmqadmin' |
29 + commands :rabbitmqadmin => '/usr/bin/rabbitmqadmin' |
43 + commands :rabbitmqadmin => '/usr/bin/rabbitmqadmin' |
30 else |
44 else |
35 + has_command(:rabbitmqadmin, '/usr/bin/rabbitmqadmin') do |
49 + has_command(:rabbitmqadmin, '/usr/bin/rabbitmqadmin') do |
36 environment :HOME => "/tmp" |
50 environment :HOME => "/tmp" |
37 end |
51 end |
38 end |
52 end |
39 |
53 |
40 --- puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_queue/rabbitmqadmin.rb.orig 2015-11-20 07:30:21.622578483 -0800 |
54 --- puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_queue/rabbitmqadmin.rb.orig 2016-04-21 06:33:06.190244636 -0700 |
41 +++ puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_queue/rabbitmqadmin.rb 2015-11-20 07:30:26.940673078 -0800 |
55 +++ puppetlabs-rabbitmq-5.3.1/lib/puppet/provider/rabbitmq_queue/rabbitmqadmin.rb 2016-04-21 06:37:27.198708092 -0700 |
42 @@ -4,12 +4,12 @@ Puppet::Type.type(:rabbitmq_queue).provi |
56 @@ -1,15 +1,19 @@ |
43 |
57 +####################################################################### |
|
58 +# Oracle has modified the originally distributed contents of this file. |
|
59 +####################################################################### |
|
60 + |
|
61 require 'json' |
|
62 require 'puppet' |
|
63 Puppet::Type.type(:rabbitmq_queue).provide(:rabbitmqadmin) do |
|
64 |
44 if Puppet::PUPPETVERSION.to_f < 3 |
65 if Puppet::PUPPETVERSION.to_f < 3 |
45 commands :rabbitmqctl => 'rabbitmqctl' |
66 commands :rabbitmqctl => 'rabbitmqctl' |
46 - commands :rabbitmqadmin => '/usr/local/bin/rabbitmqadmin' |
67 - commands :rabbitmqadmin => '/usr/local/bin/rabbitmqadmin' |
47 + commands :rabbitmqadmin => '/usr/bin/rabbitmqadmin' |
68 + commands :rabbitmqadmin => '/usr/bin/rabbitmqadmin' |
48 else |
69 else |