| 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 touch /var/lib/rabbitmq/.erlang.cookie with the |
|
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
2 |
proper ownership before starting rabbitmq. This patch is not suitable |
|
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
3 |
for upstream. |
|
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
4 |
|
|
5860
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/manifests/init.pp.orig 2016-04-21 06:25:00.840836012 -0700 |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
6 |
+++ puppetlabs-rabbitmq-5.3.1/manifests/init.pp 2016-04-21 06:25:36.238696524 -0700 |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
7 |
@@ -1,3 +1,7 @@ |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
8 |
+####################################################################### |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
9 |
+# 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
|
10 |
+####################################################################### |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
11 |
+ |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
12 |
# Main rabbitmq class |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
13 |
class rabbitmq( |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
14 |
$admin_enable = $rabbitmq::params::admin_enable, |
|
afd31ba91ee9
23146903 Puppet and OpenStack modules need modification notices
Patrick Einheber <patrick.einheber@oracle.com>
parents:
5591
diff
changeset
|
15 |
@@ -233,7 +237,13 @@ |
|
5591
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
16 |
anchor { 'rabbitmq::begin': }
|
|
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
17 |
anchor { 'rabbitmq::end': }
|
|
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
18 |
|
|
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
19 |
- Anchor['rabbitmq::begin'] -> Class['::rabbitmq::install'] |
|
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
20 |
+ file { 'cookie_owner':
|
|
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
21 |
+ path => '/var/lib/rabbitmq/.erlang.cookie', |
|
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
22 |
+ owner => 'rabbitmq', |
|
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
23 |
+ group => 'daemon', |
|
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
24 |
+ } |
|
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
25 |
+ |
|
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
26 |
+ Anchor['rabbitmq::begin'] -> Class['::rabbitmq::install'] -> File['cookie_owner'] |
|
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
27 |
-> Class['::rabbitmq::config'] ~> Class['::rabbitmq::service'] |
|
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
28 |
-> Class['::rabbitmq::management'] -> Anchor['rabbitmq::end'] |
|
d29b325ec1b3
22911268 Update puppetlabs-rabbitmq to 5.3.1
Drew Fisher <drew.fisher@oracle.com>
parents:
diff
changeset
|
29 |