diff --git a/zunclient/v1/capsules.py b/zunclient/v1/capsules.py index eb572aa3..0138eb55 100644 --- a/zunclient/v1/capsules.py +++ b/zunclient/v1/capsules.py @@ -101,9 +101,8 @@ class CapsuleManager(base.Manager): "capsules", limit=limit) - def delete(self, id, force): - return self._delete(self._path(id), - qparams={'force': force}) + def delete(self, id): + return self._delete(self._path(id)) def describe(self, id): try: diff --git a/zunclient/v1/capsules_shell.py b/zunclient/v1/capsules_shell.py index 97ec4967..a5eb32e6 100644 --- a/zunclient/v1/capsules_shell.py +++ b/zunclient/v1/capsules_shell.py @@ -75,14 +75,11 @@ def do_capsule_list(cs, args): metavar='', nargs='+', help='ID or name of the (capsule)s to delete.') -@utils.arg('-f', '--force', - action='store_true', - help='Force delete the capsule.') def do_capsule_delete(cs, args): """Delete specified capsules.""" for capsule in args.capsules: try: - cs.capsules.delete(capsule, args.force) + cs.capsules.delete(capsule) print("Request to delete capsule %s has been accepted." % capsule) except Exception as e: