summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--deployment/puppet/openstack_tasks/manifests/swift/proxy_storage.pp5
-rw-r--r--tests/noop/spec/hosts/swift/proxy_storage_spec.rb6
2 files changed, 0 insertions, 11 deletions
diff --git a/deployment/puppet/openstack_tasks/manifests/swift/proxy_storage.pp b/deployment/puppet/openstack_tasks/manifests/swift/proxy_storage.pp
index 1605a6a..3af0e92 100644
--- a/deployment/puppet/openstack_tasks/manifests/swift/proxy_storage.pp
+++ b/deployment/puppet/openstack_tasks/manifests/swift/proxy_storage.pp
@@ -186,11 +186,6 @@ class openstack_tasks::swift::proxy_storage {
186 enable => false, 186 enable => false,
187 require => Package['swift-container'], 187 require => Package['swift-container'],
188 } 188 }
189 service { 'swift-object-reconstructor':
190 ensure => stopped,
191 enable => false,
192 require => Package['swift-object'],
193 }
194 } 189 }
195 } 190 }
196 191
diff --git a/tests/noop/spec/hosts/swift/proxy_storage_spec.rb b/tests/noop/spec/hosts/swift/proxy_storage_spec.rb
index 6ad42d2..b43c6fc 100644
--- a/tests/noop/spec/hosts/swift/proxy_storage_spec.rb
+++ b/tests/noop/spec/hosts/swift/proxy_storage_spec.rb
@@ -229,12 +229,6 @@ describe manifest do
229 ).that_requires('Package[swift-container]') 229 ).that_requires('Package[swift-container]')
230 end 230 end
231 231
232 it 'should disable swift-object-reconstructor service' do
233 should contain_service('swift-object-reconstructor').with(
234 'ensure' => 'stopped',
235 'enable' => 'false',
236 ).that_requires('Package[swift-object]')
237 end
238 end 232 end
239 233
240 if deploy_swift_proxy or deploy_swift_storage 234 if deploy_swift_proxy or deploy_swift_storage