summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlex Schultz <aschultz@redhat.com>2017-06-16 11:41:44 -0600
committerAlex Schultz <aschultz@redhat.com>2017-06-16 11:43:32 -0600
commit0f596ff20327451e414fb932be458e61d38bf43f (patch)
treed184c0af9c21ce2ebd666fe424a69c4b652492d1
parent442f6a0ed7d039bfacd752cd2c96634e6ee61083 (diff)
Remove management of swift-object-reconstructor
This service is supported in upstream now and being added into puppet-swift. This needs to be removed and should be managed via swift::storage::object instead if necessary. Change-Id: I46c4c5ca0ee86404739876afe2a7110cd59fb362 Closes-Bug: #1698424
Notes
Notes (review): Verified+1: Fuel CI <fuel-ci-bot@mirantis.com> Code-Review+1: Michael Polenchuk <mpolenchuk@mirantis.com> Code-Review+2: Sergii Golovatiuk <sgolovatiuk@mirantis.com> Workflow+1: Sergii Golovatiuk <sgolovatiuk@mirantis.com> Verified+2: Jenkins Submitted-by: Jenkins Submitted-at: Thu, 06 Jul 2017 16:34:40 +0000 Reviewed-on: https://review.openstack.org/475043 Project: openstack/fuel-library Branch: refs/heads/master
-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