mkcloud: dynamically generate the (expanded) steps for the usage

SUSE-Cloud · Mar 26, 2015 · bad918f · bad918f
1 parent 06a65bd
commit bad918f
Showing 1 changed file with 23 additions and 10 deletions.
diff --git a/scripts/mkcloud b/scripts/mkcloud
@@ -1125,19 +1125,32 @@ function cloudupgrade_reboot_and_redeploy_clients()
 function usage()
 {
     echo "Usage:"
-    echo "$0 <command> [<command>,...]"
+    echo "$0 <step> [<step>,...]"
     echo
-    echo "  'command' is one of:"
-    echo "   all instonly plain cleanup prepare setupadmin prepareinstcrowbar instcrowbar setupcompute"
-    echo "   instcompute proposal addupdaterepo runupdate testsetup rebootcrowbar "
-    echo "   setuplonelynodes crowbar_register rebootcompute help"
+    echo "  'step' is one of:"
+    echo "   $allcmds"
     echo
-    echo "   all      -> expands to: cleanup prepare setupadmin addupdaterepo runupdate prepareinstcrowbar instcrowbar rebootcrowbar setupcompute instcompute proposal testsetup rebootcompute"
-    echo "   all_noreboot -> exp to: cleanup prepare setupadmin addupdaterepo runupdate prepareinstcrowbar instcrowbar setupcompute instcompute proposal testsetup"
-    echo "   plain    -> expands to: cleanup prepare setupadmin prepareinstcrowbar instcrowbar setupcompute instcompute proposal"
-    echo "   plain_with_upgrade  -> expands to: cleanup prepare setupadmin prepareinstcrowbar instcrowbar setupcompute instcompute proposal prepare_cloudupgrade cloudupgrade_1st cloudupgrade_2nd cloudupgrade_clients cloudupgrade_reboot_and_redeploy_clients"
-    echo "   instonly -> expands to: cleanup prepare setupadmin prepareinstcrowbar instcrowbar setupcompute instcompute"
+    echo " These steps are expanding to the following steps:"
+    echo "  all"
+    echo "    -> $(expand_steps all)"
+    echo "  all_noreboot"
+    echo "    -> $(expand_steps all_noreboot)"
+    echo "  plain"
+    echo "    -> $(expand_steps plain)"
+    echo "  plain_with_upgrade"
+    echo "    -> $(expand_steps plain_with_upgrade)"
+    echo "  instonly"
+    echo "    -> $(expand_steps instonly)"
+    echo "  alias_new_admin"
+    echo "    -> $(expand_steps alias_new_admin)"
+    echo "  alias_compute"
+    echo "    -> $(expand_steps alias_compute)"
+    echo "  alias_testupdate"
+    echo "    -> $(expand_steps alias_testupdate)"
+    echo "  alias_upgrade"
+    echo "    -> $(expand_steps alias_upgrade)"
     echo
+    echo " Steps:"
     echo "   cleanup:       kill all running VMs, zero out boot sectors of all LVM volumes"
     echo "   prepare:       create LVM volumes, setup libvirt networks"
     echo "   setupadmin:    create the admin node and install the cloud product"