From: Patrick East Date: Fri, 11 Mar 2016 17:59:56 +0000 (-0800) Subject: Fixup for Pure drivers cheesecake replication setup X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=fdb256e68d1077b1c2a26726cb8aa1ace0fa6dc8;p=openstack-build%2Fcinder-build.git Fixup for Pure drivers cheesecake replication setup We had a remnant of the past replication design left behind in the setup methods which was causing the arrays to be setup with bi-directional replication. With the switch to cheesecake we do not need the secondary arrays to be replicating to the primary. This change removes the step which would configure that. Change-Id: I5a0472bec8ccdf3af1e7ce42163b42289b1810bb Closes-Bug: #1556211 --- diff --git a/cinder/tests/unit/test_pure.py b/cinder/tests/unit/test_pure.py index c6c941086..8900b4688 100644 --- a/cinder/tests/unit/test_pure.py +++ b/cinder/tests/unit/test_pure.py @@ -496,8 +496,6 @@ class PureBaseVolumeDriverTestCase(PureBaseSharedDriverTestCase): self.assertEqual(self.array2, self.driver._replication_target_arrays[0]) calls = [ - mock.call(self.array2, [self.array], 'cinder-group', - REPLICATION_INTERVAL_IN_SEC, retention), mock.call(self.array, [self.array2], 'cinder-group', REPLICATION_INTERVAL_IN_SEC, retention) ] diff --git a/cinder/volume/drivers/pure.py b/cinder/volume/drivers/pure.py index ed39440ab..664bdebf8 100644 --- a/cinder/volume/drivers/pure.py +++ b/cinder/volume/drivers/pure.py @@ -203,10 +203,6 @@ class PureBaseVolumeDriver(san.SanDriver): target_array.array_id = target_array_info["id"] LOG.debug("secondary array name: %s", target_array.array_name) LOG.debug("secondary array id: %s", target_array.array_id) - self._setup_replicated_pgroups(target_array, [primary_array], - self._replication_pg_name, - self._replication_interval, - retention_policy) self._replication_target_arrays.append(target_array) self._setup_replicated_pgroups(primary_array, self._replication_target_arrays,