mgr,mon: use CephChoices for confirmation flags

...so that arg parsing can rely on strings satisfying
a "doesn't start with --" convention.

Signed-off-by: John Spray <john.spray@redhat.com>

diff --git a/src/mgr/MgrCommands.h b/src/mgr/MgrCommands.h
index 64631e9ddb0e3d18e6a332d6b3600c801162a208..d81c61a3642c1abdf83d3f9827dd6d1c67a8da00 100644 (file)
--- a/src/mgr/MgrCommands.h
+++ b/src/mgr/MgrCommands.h
@@ -108,14 +108,14 @@ COMMAND("osd test-reweight-by-pg " \
 
 COMMAND("osd destroy "     \
         "name=id,type=CephOsdName " \
-        "name=sure,type=CephString,req=False",
+       "name=sure,type=CephChoices,strings=--force|--yes-i-really-mean-it,req=false", \
         "mark osd as being destroyed. Keeps the ID intact (allowing reuse), " \
         "but removes cephx keys, config-key data and lockbox keys, "\
         "rendering data permanently unreadable.", \
         "osd", "rw")
 COMMAND("osd purge " \
         "name=id,type=CephOsdName " \
-        "name=sure,type=CephString,req=false",                      \
+       "name=sure,type=CephChoices,strings=--force|--yes-i-really-mean-it,req=false", \
         "purge all osd data from the monitors including the OSD id " \
        "and CRUSH position",                                        \
        "osd", "rw")

diff --git a/src/mon/MonCommands.h b/src/mon/MonCommands.h
index 3877fdaadb7ff2f176919d81c3156e63ee44f002..8039a79fb58c74c49fa62b65139c171d95d4a7b4 100644 (file)
--- a/src/mon/MonCommands.h
+++ b/src/mon/MonCommands.h
@@ -942,14 +942,16 @@ COMMAND("osd pool create " \
 COMMAND_WITH_FLAG("osd pool delete " \
        "name=pool,type=CephPoolname " \
        "name=pool2,type=CephPoolname,req=false " \
-       "name=sure,type=CephString,req=false", \
+       "name=sure,type=CephChoices,strings=--yes-i-really-really-mean-it|" \
+        "--yes-i-really-really-mean-it-not-faking,req=false", \
        "delete pool", \
        "osd", "rw", \
     FLAG(DEPRECATED))
 COMMAND("osd pool rm " \
        "name=pool,type=CephPoolname " \
        "name=pool2,type=CephPoolname,req=false " \
-       "name=sure,type=CephString,req=false", \
+       "name=sure,type=CephChoices,strings=--yes-i-really-really-mean-it|" \
+        "--yes-i-really-really-mean-it-not-faking,req=false", \
        "remove pool", \
        "osd", "rw")
 COMMAND("osd pool rename " \