From 264c2d4748388ca815cbbb0899e953bd8f888b71 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Tue, 18 Jun 2019 21:33:39 -0400 Subject: [PATCH] Fix broken prompting for pool removal --- client-cli/pvc.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/client-cli/pvc.py b/client-cli/pvc.py index 362b2337..b05dd947 100755 --- a/client-cli/pvc.py +++ b/client-cli/pvc.py @@ -1283,17 +1283,17 @@ def ceph_pool_add(name, pgs): 'name' ) @click.option('--yes', is_flag=True, - expose_value=False, prompt='DANGER: This command will destroy this pool and all volumes. Do you want to continue?' ) -def ceph_pool_remove(name): +def ceph_pool_remove(name, yes): """ Remove a Ceph RBD pool with name NAME and all volumes on it. """ - zk_conn = pvc_common.startZKConnection(zk_host) - retcode, retmsg = pvc_ceph.remove_pool(zk_conn, name) - cleanup(retcode, retmsg, zk_conn) + if yes: + zk_conn = pvc_common.startZKConnection(zk_host) + retcode, retmsg = pvc_ceph.remove_pool(zk_conn, name) + cleanup(retcode, retmsg, zk_conn) ############################################################################### # pvc ceph pool list