openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "scenario002 swift ring devices >= replica count"

Browse Source
This commit is contained in:
Jenkins 2016-01-07 21:17:15 +00:00 committed by Gerrit Code Review
commit f3bdf37186
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fixtures/scenario002.pp
View File

@ -33,4 +33,5 @@ class { '::openstack_integration::tempest':
sahara => true, sahara => true,
heat => true, heat => true,
swift => true, swift => true,
require => Class['::rabbitmq'],
} }

9
manifests/swift.pp
View File

@ -52,17 +52,18 @@ class openstack_integration::swift {
$swift_components = ['account', 'container', 'object'] $swift_components = ['account', 'container', 'object']
swift::storage::filter::recon { $swift_components : } swift::storage::filter::recon { $swift_components : }
swift::storage::filter::healthcheck { $swift_components : } swift::storage::filter::healthcheck { $swift_components : }
ring_object_device { '127.0.0.1:6000/1': # As of mitaka swift-ring-builder requires devices >= replica count
# Default replica count is 3
ring_object_device { ['127.0.0.1:6000/1', '127.0.0.1:6000/2', '127.0.0.1:6000/3']:
zone => 1, zone => 1,
weight => 1, weight => 1,
} }
ring_container_device { '127.0.0.1:6001/1': ring_container_device { ['127.0.0.1:6001/1', '127.0.0.1:6001/2','127.0.0.1:6001/3']:
zone => 1, zone => 1,
weight => 1, weight => 1,
} }
ring_account_device { '127.0.0.1:6002/1': ring_account_device { ['127.0.0.1:6002/1', '127.0.0.1:6002/2','127.0.0.1:6002/3']:
zone => 1, zone => 1,
weight => 1, weight => 1,
} }
} }