diff options
| author |   Christian Schwede <cschwede@redhat.com> | 2017-06-08 17:32:14 +0200 |
|---|---|---|
| committer | Christian Schwede <cschwede@redhat.com> | 2017-06-09 12:08:35 +0200 |
| commit | 6e81485315fb658e54d43ac32c3346af3bd5c862 (patch) | |
| tree | dade44bfa3d943cd12c7a91b6ab1e93fa34702de | |
| parent | 0a75929adeea9ea7a53ad5a45c9bb1f1b6962b9b (diff) | |
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
| -rw-r--r-- | manifests/profile/base/swift/ringbuilder.pp | 4 |
1 files 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'] } } |