components/ruby/puppet-modules/openstack-swift/patches/05-remove-rsync-server.patch
equal
deleted
inserted
replaced
10 +####################################################################### |
10 +####################################################################### |
11 + |
11 + |
12 # == Class: swift::ringserver |
12 # == Class: swift::ringserver |
13 # |
13 # |
14 # Used to create an rsync server to serve up the ring databases via rsync |
14 # Used to create an rsync server to serve up the ring databases via rsync |
15 @@ -32,20 +36,9 @@ |
15 @@ -32,20 +36,9 @@ class swift::ringserver( |
16 |
16 |
17 Class['swift::ringbuilder'] -> Class['swift::ringserver'] |
17 Class['swift::ringbuilder'] -> Class['swift::ringserver'] |
18 |
18 |
19 - if !defined(Class['rsync::server']) { |
19 - if !defined(Class['rsync::server']) { |
20 - class { '::rsync::server': |
20 - class { '::rsync::server': |
21 - use_xinetd => true, |
21 - use_xinetd => true, |
22 - address => $local_net_ip, |
22 - address => $local_net_ip, |
23 - use_chroot => 'no', |
23 - use_chroot => 'no', |
34 - gid => 'swift', |
34 - gid => 'swift', |
35 - max_connections => $max_connections, |
35 - max_connections => $max_connections, |
36 - read_only => true, |
36 - read_only => true, |
37 - } |
37 - } |
38 } |
38 } |
|
39 |
39 --- openstack-swift-6.1.0/manifests/storage.pp.orig 2016-04-21 08:35:49.421176646 -0700 |
40 --- openstack-swift-6.1.0/manifests/storage.pp.orig 2016-04-21 08:35:49.421176646 -0700 |
40 +++ openstack-swift-6.1.0/manifests/storage.pp 2016-04-21 08:36:21.531668180 -0700 |
41 +++ openstack-swift-6.1.0/manifests/storage.pp 2016-04-21 08:36:21.531668180 -0700 |
41 @@ -1,3 +1,7 @@ |
42 @@ -1,3 +1,7 @@ |
42 +####################################################################### |
43 +####################################################################### |
43 +# Oracle has modified the originally distributed contents of this file. |
44 +# Oracle has modified the originally distributed contents of this file. |
59 + service { 'application/openstack/swift/swift-replicator-rsync': |
60 + service { 'application/openstack/swift/swift-replicator-rsync': |
60 + ensure => 'running', |
61 + ensure => 'running', |
61 } |
62 } |
62 } |
63 } |
63 } |
64 } |
|
65 |
64 --- openstack-swift-6.1.0/manifests/storage/server.pp.orig 2016-04-21 08:35:54.242984740 -0700 |
66 --- openstack-swift-6.1.0/manifests/storage/server.pp.orig 2016-04-21 08:35:54.242984740 -0700 |
65 +++ openstack-swift-6.1.0/manifests/storage/server.pp 2016-04-21 08:36:24.979535088 -0700 |
67 +++ openstack-swift-6.1.0/manifests/storage/server.pp 2016-04-21 08:36:24.979535088 -0700 |
66 @@ -1,3 +1,7 @@ |
68 @@ -1,3 +1,7 @@ |
67 +####################################################################### |
69 +####################################################################### |
68 +# Oracle has modified the originally distributed contents of this file. |
70 +# Oracle has modified the originally distributed contents of this file. |