1 In-house patch to add support for Solaris 11.3 and 12.0. This patch |
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 |
2 has not yet been submitted upstream due to requirements for 3rd party |
3 CI testing. |
3 CI testing. |
4 |
4 |
5 --- openstack-swift-6.1.0/manifests/init.pp.orig 2015-08-10 11:12:30.293187329 -0700 |
5 --- openstack-swift-6.1.0/manifests/init.pp.orig 2016-04-21 09:04:49.670248833 -0700 |
6 +++ openstack-swift-6.1.0/manifests/init.pp 2015-08-10 11:13:32.086133292 -0700 |
6 +++ openstack-swift-6.1.0/manifests/init.pp 2016-04-21 09:05:19.849256812 -0700 |
7 @@ -2,6 +2,10 @@ |
7 @@ -1,7 +1,15 @@ |
|
8 +####################################################################### |
|
9 +# Oracle has modified the originally distributed contents of this file. |
|
10 +####################################################################### |
|
11 + |
|
12 # Install and configure base swift components |
8 # |
13 # |
9 # == Parameters |
14 # == Parameters |
10 # |
15 # |
11 +# [*swift_hash_prefix*] string of text to be used |
16 +# [*swift_hash_prefix*] string of text to be used |
12 +# as a salt when hashing to determine mappings in the ring. |
17 +# as a salt when hashing to determine mappings in the ring. |
13 +# This file should be the same on every node in the cluster. |
18 +# This file should be the same on every node in the cluster. |
14 +# |
19 +# |
15 # [*swift_hash_suffix*] string of text to be used |
20 # [*swift_hash_suffix*] string of text to be used |
16 # as a salt when hashing to determine mappings in the ring. |
21 # as a salt when hashing to determine mappings in the ring. |
17 # This file should be the same on every node in the cluster. |
22 # This file should be the same on every node in the cluster. |
18 @@ -29,6 +33,7 @@ |
23 @@ -29,6 +37,7 @@ |
19 # Copyright 2011 Puppetlabs Inc, unless otherwise noted. |
24 # Copyright 2011 Puppetlabs Inc, unless otherwise noted. |
20 # |
25 # |
21 class swift( |
26 class swift( |
22 + $swift_hash_prefix, |
27 + $swift_hash_prefix, |
23 $swift_hash_suffix, |
28 $swift_hash_suffix, |
24 $package_ensure = 'present', |
29 $package_ensure = 'present', |
25 $client_package_ensure = 'present', |
30 $client_package_ensure = 'present', |
26 @@ -49,27 +54,9 @@ class swift( |
31 @@ -49,27 +58,9 @@ |
27 ensure => $client_package_ensure; |
32 ensure => $client_package_ensure; |
28 } |
33 } |
29 |
34 |
30 - File { owner => 'swift', group => 'swift', require => Package['swift'] } |
35 - File { owner => 'swift', group => 'swift', require => Package['swift'] } |
31 - |
36 - |
32 - file { '/etc/swift': |
37 - file { '/etc/swift': |
33 - ensure => directory, |
38 - ensure => directory, |
34 - mode => '2770', |
39 - mode => '2770', |