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/storage/account.pp.orig 2015-11-01 07:14:14.938361224 -0800 |
5 --- openstack-swift-6.1.0/manifests/storage/account.pp.orig 2016-04-21 08:40:58.647841720 -0700 |
6 +++ openstack-swift-6.1.0/manifests/storage/account.pp 2015-11-01 07:14:28.358271152 -0800 |
6 +++ openstack-swift-6.1.0/manifests/storage/account.pp 2016-04-21 08:41:37.781959002 -0700 |
7 @@ -43,7 +43,6 @@ class swift::storage::account( |
7 @@ -1,3 +1,7 @@ |
|
8 +####################################################################### |
|
9 +# Oracle has modified the originally distributed contents of this file. |
|
10 +####################################################################### |
|
11 + |
|
12 # Class swift::storage::account |
|
13 # |
|
14 # == Parameters |
|
15 @@ -43,7 +47,6 @@ |
8 name => $::swift::params::account_reaper_service_name, |
16 name => $::swift::params::account_reaper_service_name, |
9 enable => $enabled, |
17 enable => $enabled, |
10 provider => $::swift::params::service_provider, |
18 provider => $::swift::params::service_provider, |
11 - require => Package['swift-account'], |
19 - require => Package['swift-account'], |
12 } |
20 } |
13 |
21 |
14 service { 'swift-account-auditor': |
22 service { 'swift-account-auditor': |
15 @@ -51,6 +50,5 @@ class swift::storage::account( |
23 @@ -51,6 +54,5 @@ |
16 name => $::swift::params::account_auditor_service_name, |
24 name => $::swift::params::account_auditor_service_name, |
17 enable => $enabled, |
25 enable => $enabled, |
18 provider => $::swift::params::service_provider, |
26 provider => $::swift::params::service_provider, |
19 - require => Package['swift-account'], |
27 - require => Package['swift-account'], |
20 } |
28 } |
21 } |
29 } |
22 --- openstack-swift-6.1.0/manifests/storage/container.pp.orig 2015-11-01 07:15:34.539750559 -0800 |
30 --- openstack-swift-6.1.0/manifests/storage/container.pp.orig 2016-04-21 08:41:03.411182222 -0700 |
23 +++ openstack-swift-6.1.0/manifests/storage/container.pp 2015-11-01 07:15:55.927391806 -0800 |
31 +++ openstack-swift-6.1.0/manifests/storage/container.pp 2016-04-21 08:41:41.863686954 -0700 |
24 @@ -48,7 +48,6 @@ class swift::storage::container( |
32 @@ -1,3 +1,7 @@ |
|
33 +####################################################################### |
|
34 +# Oracle has modified the originally distributed contents of this file. |
|
35 +####################################################################### |
|
36 + |
|
37 # |
|
38 # === Parameters |
|
39 # |
|
40 @@ -48,7 +52,6 @@ |
25 name => $::swift::params::container_updater_service_name, |
41 name => $::swift::params::container_updater_service_name, |
26 enable => $enabled, |
42 enable => $enabled, |
27 provider => $::swift::params::service_provider, |
43 provider => $::swift::params::service_provider, |
28 - require => Package['swift-container'], |
44 - require => Package['swift-container'], |
29 } |
45 } |
30 |
46 |
31 service { 'swift-container-auditor': |
47 service { 'swift-container-auditor': |
32 @@ -56,7 +55,6 @@ class swift::storage::container( |
48 @@ -56,7 +59,6 @@ |
33 name => $::swift::params::container_auditor_service_name, |
49 name => $::swift::params::container_auditor_service_name, |
34 enable => $enabled, |
50 enable => $enabled, |
35 provider => $::swift::params::service_provider, |
51 provider => $::swift::params::service_provider, |
36 - require => Package['swift-container'], |
52 - require => Package['swift-container'], |
37 } |
53 } |
38 |
54 |
39 if $::operatingsystem == 'Ubuntu' { |
55 if $::operatingsystem == 'Ubuntu' { |
40 --- openstack-swift-6.1.0/manifests/storage/object.pp.orig 2015-11-01 07:16:23.265853901 -0800 |
56 --- openstack-swift-6.1.0/manifests/storage/object.pp.orig 2016-04-21 08:41:08.181529232 -0700 |
41 +++ openstack-swift-6.1.0/manifests/storage/object.pp 2015-11-01 07:16:37.685187620 -0800 |
57 +++ openstack-swift-6.1.0/manifests/storage/object.pp 2016-04-21 08:41:44.966394780 -0700 |
42 @@ -43,7 +43,6 @@ class swift::storage::object( |
58 @@ -1,3 +1,7 @@ |
|
59 +####################################################################### |
|
60 +# Oracle has modified the originally distributed contents of this file. |
|
61 +####################################################################### |
|
62 + |
|
63 # Class swift::storage::object |
|
64 # |
|
65 # == Parameters |
|
66 @@ -43,7 +47,6 @@ |
43 name => $::swift::params::object_updater_service_name, |
67 name => $::swift::params::object_updater_service_name, |
44 enable => $enabled, |
68 enable => $enabled, |
45 provider => $::swift::params::service_provider, |
69 provider => $::swift::params::service_provider, |
46 - require => Package['swift-object'], |
70 - require => Package['swift-object'], |
47 } |
71 } |
48 |
72 |
49 service { 'swift-object-auditor': |
73 service { 'swift-object-auditor': |
50 @@ -51,6 +50,5 @@ class swift::storage::object( |
74 @@ -51,6 +54,5 @@ |
51 name => $::swift::params::object_auditor_service_name, |
75 name => $::swift::params::object_auditor_service_name, |
52 enable => $enabled, |
76 enable => $enabled, |
53 provider => $::swift::params::service_provider, |
77 provider => $::swift::params::service_provider, |
54 - require => Package['swift-object'], |
78 - require => Package['swift-object'], |
55 } |
79 } |
56 } |
80 } |
57 --- openstack-swift-6.1.0/manifests/storage/generic.pp.orig 2015-11-01 07:17:15.132929299 -0800 |
81 --- openstack-swift-6.1.0/manifests/storage/generic.pp.orig 2016-04-21 08:41:14.272088204 -0700 |
58 +++ openstack-swift-6.1.0/manifests/storage/generic.pp 2015-11-01 07:17:33.210237904 -0800 |
82 +++ openstack-swift-6.1.0/manifests/storage/generic.pp 2016-04-21 08:41:48.797848159 -0700 |
59 @@ -42,21 +42,6 @@ define swift::storage::generic( |
83 @@ -1,3 +1,7 @@ |
|
84 +####################################################################### |
|
85 +# Oracle has modified the originally distributed contents of this file. |
|
86 +####################################################################### |
|
87 + |
|
88 # Creates the files packages and services that are |
|
89 # needed to deploy each type of storage server. |
|
90 # |
|
91 @@ -42,21 +46,6 @@ |
60 |
92 |
61 validate_re($name, '^object|container|account$') |
93 validate_re($name, '^object|container|account$') |
62 |
94 |
63 - package { "swift-${name}": |
95 - package { "swift-${name}": |
64 - ensure => $package_ensure, |
96 - ensure => $package_ensure, |