docker_volume: revert #47390 (#50663)

* Revert "Fix option change detection / force support for docker_volume. (#47390)"

This reverts commit 8ef994fbc5.

* Update changelog.

* Adjusting tests.
This commit is contained in:
Felix Fontein 2019-01-11 21:41:37 +01:00 committed by Adam Miller
parent fd56788a14
commit 0e7a9a2771
3 changed files with 40 additions and 5 deletions

View file

@ -249,7 +249,7 @@ class DockerVolumeManager(object):
differences = self.has_different_config()
self.diff_tracker.add('exists', parameter=True, active=self.existing_volume is not None)
if not differences.empty or self.parameters.force:
if not differences.empty and self.parameters.force:
self.remove_volume()
self.existing_volume = None