From 838e2e44ac9c99fd0e80d90c90dd8c2a2f2505c8 Mon Sep 17 00:00:00 2001 From: Adam Vinsh Date: Tue, 5 Jan 2016 10:01:28 -0500 Subject: [PATCH] scenario002 swift ring devices >= replica count New in mitaka: swift-ring-builder requires that ring devices be >= replica count. Change-Id: I4a3997ca53d1c632c395a90e51debe37c9aafadb --- fixtures/scenario002.pp | 1 + manifests/swift.pp | 9 +++++---- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/fixtures/scenario002.pp b/fixtures/scenario002.pp index 03dd4c7e8..a0123d65a 100644 --- a/fixtures/scenario002.pp +++ b/fixtures/scenario002.pp @@ -33,4 +33,5 @@ class { '::openstack_integration::tempest': sahara => true, heat => true, swift => true, + require => Class['::rabbitmq'], } diff --git a/manifests/swift.pp b/manifests/swift.pp index 119026027..fe1b41676 100644 --- a/manifests/swift.pp +++ b/manifests/swift.pp @@ -51,17 +51,18 @@ class openstack_integration::swift { $swift_components = ['account', 'container', 'object'] swift::storage::filter::recon { $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, 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, 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, weight => 1, } - }