From 6e81485315fb658e54d43ac32c3346af3bd5c862 Mon Sep 17 00:00:00 2001 From: Christian Schwede Date: Thu, 8 Jun 2017 17:32:14 +0200 Subject: Fix Swift ring rebalance order The current order is broken if there were changes to the account and container devices, but not to the object devices. In these cases it can happen that the rebalance happens before modifying devices. Change-Id: I15641c32266939c9a00936cc471cc59b1bb54eec --- manifests/profile/base/swift/ringbuilder.pp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp index f7cfea4..f6f8f06 100644 --- a/manifests/profile/base/swift/ringbuilder.pp +++ b/manifests/profile/base/swift/ringbuilder.pp @@ -130,8 +130,8 @@ class tripleo::profile::base::swift::ringbuilder ( } Ring_object_device<| |> ~> Exec['rebalance_object'] - Ring_object_device<| |> ~> Exec['rebalance_account'] - Ring_object_device<| |> ~> Exec['rebalance_container'] + Ring_account_device<| |> ~> Exec['rebalance_account'] + Ring_container_device<| |> ~> Exec['rebalance_container'] } } -- cgit 1.2.3-korg