|
1 In-house patch to add support for Solaris 11.3 and 12.0. This patch |
|
2 has not yet been submitted upstream due to requirements for 3rd party |
|
3 CI testing. |
|
4 |
|
5 --- openstack-swift-6.1.0/manifests/ringserver.pp.orig 2015-10-15 08:03:54.000000000 -0700 |
|
6 +++ openstack-swift-6.1.0/manifests/ringserver.pp 2015-11-02 09:49:22.778783205 -0800 |
|
7 @@ -32,20 +32,9 @@ class swift::ringserver( |
|
8 |
|
9 Class['swift::ringbuilder'] -> Class['swift::ringserver'] |
|
10 |
|
11 - if !defined(Class['rsync::server']) { |
|
12 - class { '::rsync::server': |
|
13 - use_xinetd => true, |
|
14 - address => $local_net_ip, |
|
15 - use_chroot => 'no', |
|
16 + if !defined(Service['application/openstack/swift/swift-replicator-rsync']) { |
|
17 + service { 'application/openstack/swift/swift-replicator-rsync': |
|
18 + ensure => 'running', |
|
19 } |
|
20 } |
|
21 - |
|
22 - rsync::server::module { 'swift_server': |
|
23 - path => '/etc/swift', |
|
24 - lock_file => '/var/lock/swift_server.lock', |
|
25 - uid => 'swift', |
|
26 - gid => 'swift', |
|
27 - max_connections => $max_connections, |
|
28 - read_only => true, |
|
29 - } |
|
30 } |
|
31 |
|
32 --- openstack-swift-6.1.0/manifests/storage.pp.orig 2015-10-15 08:03:54.000000000 -0700 |
|
33 +++ openstack-swift-6.1.0/manifests/storage.pp 2015-11-02 09:46:53.798720245 -0800 |
|
34 @@ -23,11 +23,9 @@ class swift::storage( |
|
35 $storage_local_net_ip |
|
36 ) { |
|
37 |
|
38 - if !defined(Class['rsync::server']){ |
|
39 - class{ '::rsync::server': |
|
40 - use_xinetd => true, |
|
41 - address => $storage_local_net_ip, |
|
42 - use_chroot => 'no', |
|
43 + if !defined(Service['application/openstack/swift/swift-replicator-rsync']) { |
|
44 + service { 'application/openstack/swift/swift-replicator-rsync': |
|
45 + ensure => 'running', |
|
46 } |
|
47 } |
|
48 } |
|
49 |
|
50 --- openstack-swift-6.1.0/manifests/storage/server.pp.orig 2015-11-02 09:51:04.785489361 -0800 |
|
51 +++ openstack-swift-6.1.0/manifests/storage/server.pp 2015-11-02 09:51:16.912645480 -0800 |
|
52 @@ -165,17 +165,6 @@ define swift::storage::server( |
|
53 |
|
54 $bind_port = $name |
|
55 |
|
56 - rsync::server::module { $type: |
|
57 - path => $devices, |
|
58 - lock_file => "/var/lock/${type}.lock", |
|
59 - uid => $owner, |
|
60 - gid => $group, |
|
61 - incoming_chmod => $incoming_chmod, |
|
62 - outgoing_chmod => $outgoing_chmod, |
|
63 - max_connections => $max_connections, |
|
64 - read_only => false, |
|
65 - } |
|
66 - |
|
67 concat { "/etc/swift/${config_file_path}": |
|
68 owner => $owner, |
|
69 group => $group, |