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

diff --git a/manifests/profile/base/swift/ringbuilder.pp b/manifests/profile/base/swift/ringbuilder.pp
index f7cfea4..f6f8f06 100644 (file)
--- 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']
     }
   }