Merge pull request #1138 from freyes/swift-proxy-race

swift-proxy: wait for model to settle after running action [Antelope backport]

zaza/openstack/charm_tests/swift/tests.py

@@ -125,6 +125,13 @@ def test_904_set_weight_action_and_validate_rebalance(self):
                            'search-value': self.TEST_SEARCH_TARGET,
                            'weight': self.TEST_WEIGHT_INITIAL})
         self.assertEqual(action.status, "completed")
+        # let everything settle, because after the set-weight action the
+        # swift-storage units need to get run swift-storage-relation-changed to
+        # get the new ring
+        logging.info("Waiting for model to settle.")
+        zaza.model.wait_for_agent_status()
+        zaza.model.block_until_all_units_idle()
+
         self.assertTrue(
             swift_utils.is_ring_synced('swift-proxy', 'object',
                                        self.TEST_EXPECTED_RING_HOSTS))