10 +####################################################################### |
10 +####################################################################### |
11 + |
11 + |
12 # Class swift::storage::account |
12 # Class swift::storage::account |
13 # |
13 # |
14 # == Parameters |
14 # == Parameters |
15 @@ -43,7 +47,6 @@ |
15 @@ -58,7 +62,6 @@ class swift::storage::account( |
16 name => $::swift::params::account_reaper_service_name, |
16 enabled => $enabled, |
17 enable => $enabled, |
17 config_file_name => $config_file_name, |
18 provider => $::swift::params::service_provider, |
18 service_provider => $service_provider, |
19 - require => Package['swift-account'], |
19 - require => Package['swift-account'], |
20 } |
20 subscribe => File["/etc/swift/${config_file_name}"], |
21 |
|
22 service { 'swift-account-auditor': |
|
23 @@ -51,6 +54,5 @@ |
|
24 name => $::swift::params::account_auditor_service_name, |
|
25 enable => $enabled, |
|
26 provider => $::swift::params::service_provider, |
|
27 - require => Package['swift-account'], |
|
28 } |
21 } |
29 } |
22 } |
|
23 |
30 --- openstack-swift-6.1.0/manifests/storage/container.pp.orig 2016-04-21 08:41:03.411182222 -0700 |
24 --- openstack-swift-6.1.0/manifests/storage/container.pp.orig 2016-04-21 08:41:03.411182222 -0700 |
31 +++ openstack-swift-6.1.0/manifests/storage/container.pp 2016-04-21 08:41:41.863686954 -0700 |
25 +++ openstack-swift-6.1.0/manifests/storage/container.pp 2016-04-21 08:41:41.863686954 -0700 |
32 @@ -1,3 +1,7 @@ |
26 @@ -1,3 +1,7 @@ |
33 +####################################################################### |
27 +####################################################################### |
34 +# Oracle has modified the originally distributed contents of this file. |
28 +# Oracle has modified the originally distributed contents of this file. |
35 +####################################################################### |
29 +####################################################################### |
36 + |
30 + |
|
31 # Class swift::storage::container |
37 # |
32 # |
38 # === Parameters |
33 # === Parameters |
39 # |
34 @@ -64,7 +68,6 @@ class swift::storage::container( |
40 @@ -48,7 +52,6 @@ |
35 enabled => $enabled, |
41 name => $::swift::params::container_updater_service_name, |
36 config_file_name => $config_file_name, |
42 enable => $enabled, |
37 service_provider => $service_provider, |
43 provider => $::swift::params::service_provider, |
38 - require => Package['swift-container'], |
44 - require => Package['swift-container'], |
39 subscribe => File["/etc/swift/${config_file_name}"], |
45 } |
40 } |
46 |
41 |
47 service { 'swift-container-auditor': |
42 @@ -75,7 +78,6 @@ class swift::storage::container( |
48 @@ -56,7 +59,6 @@ |
43 enabled => $enabled, |
49 name => $::swift::params::container_auditor_service_name, |
44 config_file_name => $config_file_name, |
50 enable => $enabled, |
45 service_provider => $service_provider, |
51 provider => $::swift::params::service_provider, |
46 - require => Package['swift-container'], |
52 - require => Package['swift-container'], |
47 subscribe => File["/etc/swift/${config_file_name}"], |
53 } |
48 } |
54 |
49 Swift_config<| |> ~> Service['swift-container-sync'] |
55 if $::operatingsystem == 'Ubuntu' { |
50 |
56 --- openstack-swift-6.1.0/manifests/storage/object.pp.orig 2016-04-21 08:41:08.181529232 -0700 |
51 --- openstack-swift-6.1.0/manifests/storage/object.pp.orig 2016-04-21 08:41:08.181529232 -0700 |
57 +++ openstack-swift-6.1.0/manifests/storage/object.pp 2016-04-21 08:41:44.966394780 -0700 |
52 +++ openstack-swift-6.1.0/manifests/storage/object.pp 2016-04-21 08:41:44.966394780 -0700 |
58 @@ -1,3 +1,7 @@ |
|
59 +####################################################################### |
53 +####################################################################### |
60 +# Oracle has modified the originally distributed contents of this file. |
54 +# Oracle has modified the originally distributed contents of this file. |
61 +####################################################################### |
55 +####################################################################### |
62 + |
56 + |
63 # Class swift::storage::object |
57 # Class swift::storage::object |
64 # |
58 # |
65 # == Parameters |
59 # == Parameters |
66 @@ -43,7 +47,6 @@ |
60 @@ -58,7 +62,6 @@ class swift::storage::object( |
67 name => $::swift::params::object_updater_service_name, |
61 enabled => $enabled, |
68 enable => $enabled, |
62 config_file_name => $config_file_name, |
69 provider => $::swift::params::service_provider, |
63 service_provider => $service_provider, |
70 - require => Package['swift-object'], |
64 - require => Package['swift-object'], |
71 } |
65 subscribe => File["/etc/swift/${config_file_name}"], |
72 |
|
73 service { 'swift-object-auditor': |
|
74 @@ -51,6 +54,5 @@ |
|
75 name => $::swift::params::object_auditor_service_name, |
|
76 enable => $enabled, |
|
77 provider => $::swift::params::service_provider, |
|
78 - require => Package['swift-object'], |
|
79 } |
66 } |
80 } |
67 } |
|
68 |
81 --- openstack-swift-6.1.0/manifests/storage/generic.pp.orig 2016-04-21 08:41:14.272088204 -0700 |
69 --- openstack-swift-6.1.0/manifests/storage/generic.pp.orig 2016-04-21 08:41:14.272088204 -0700 |
82 +++ openstack-swift-6.1.0/manifests/storage/generic.pp 2016-04-21 08:41:48.797848159 -0700 |
70 +++ openstack-swift-6.1.0/manifests/storage/generic.pp 2016-04-21 08:41:48.797848159 -0700 |
83 @@ -1,3 +1,7 @@ |
71 @@ -1,3 +1,7 @@ |
84 +####################################################################### |
72 +####################################################################### |
85 +# Oracle has modified the originally distributed contents of this file. |
73 +# Oracle has modified the originally distributed contents of this file. |
86 +####################################################################### |
74 +####################################################################### |
87 + |
75 + |
88 # Creates the files packages and services that are |
76 # Creates the files packages and services that are |
89 # needed to deploy each type of storage server. |
77 # needed to deploy each type of storage server. |
90 # |
78 # |
91 @@ -42,21 +46,6 @@ |
79 @@ -47,20 +51,6 @@ define swift::storage::generic( |
92 |
80 |
93 validate_re($name, '^object|container|account$') |
81 validate_re($name, '^object|container|account$') |
94 |
82 |
95 - package { "swift-${name}": |
83 - package { "swift-${name}": |
96 - ensure => $package_ensure, |
84 - ensure => $package_ensure, |
97 - # this is a way to dynamically build the variables to lookup |
85 - name => getvar("::swift::params::${name}_package_name"), |
98 - # sorry its so ugly :( |
86 - tag => ['openstack', 'swift-package'], |
99 - name => inline_template("<%= scope.lookupvar('::swift::params::${name}_package_name') %>"), |
87 - before => Service["swift-${name}-server", "swift-${name}-replicator"], |
100 - tag => 'openstack', |
|
101 - before => Service["swift-${name}", "swift-${name}-replicator"], |
|
102 - } |
88 - } |
103 - |
89 - |
104 - file { "/etc/swift/${name}-server/": |
90 - file { "/etc/swift/${name}-server/": |
105 - ensure => directory, |
91 - ensure => directory, |
106 - owner => 'swift', |
92 - owner => 'swift', |
107 - group => 'swift', |
93 - group => 'swift', |
|
94 - require => Package["swift-${name}"], |
108 - } |
95 - } |
109 - |
96 - |
110 if $manage_service { |
97 if $manage_service { |
111 if $enabled { |
98 if $enabled { |
112 $service_ensure = 'running' |
99 $service_ensure = 'running' |
113 @@ -71,7 +60,6 @@ |
100 @@ -75,7 +65,6 @@ define swift::storage::generic( |
114 enable => $enabled, |
101 enabled => $enabled, |
115 hasstatus => true, |
102 config_file_name => $config_file_name, |
116 provider => $service_provider, |
103 service_provider => $service_provider, |
117 - subscribe => Package["swift-${name}"], |
104 - subscribe => Package["swift-${name}"], |
118 } |
105 } |
119 |
106 |
120 service { "swift-${name}-replicator": |
107 swift::service { "swift-${name}-replicator": |
121 @@ -80,7 +68,6 @@ |
108 @@ -84,7 +73,6 @@ define swift::storage::generic( |
122 enable => $enabled, |
109 enabled => $enabled, |
123 hasstatus => true, |
110 config_file_name => $config_file_name, |
124 provider => $service_provider, |
111 service_provider => $service_provider, |
125 - subscribe => Package["swift-${name}"], |
112 - subscribe => Package["swift-${name}"], |
126 } |
113 } |
127 |
114 |
128 } |
115 swift::service { "swift-${name}-auditor": |