Updated --deployer-list to match recent changes to --aux-list

clusterd.py

@@ -31,7 +31,7 @@ def prerun(options):
 
     # then check if they want a listing of all deployers
     if options.deploy_list:
-        deploy_utils.deploy_list()
+        deploy_utils.deploy_list(options.deploy_list)
 
     if options.aux_list:
         deploy_utils.auxiliary_list(options.aux_list)

src/core/parse_cmd.py

@@ -95,7 +95,8 @@ def parse(arguments):
     other = parser.add_argument_group("Other",
                             description='Miscellaneous flags')
     other.add_argument("--deployer-list", help="List all available deployers",
-                    action='store_true', dest='deploy_list', default=False)
+                    action='store', dest='deploy_list', const='All', nargs='?',
+                    metavar='platform')
     other.add_argument("--aux-list", help="List all available exploits",
                     action='store', dest='aux_list', const='All', nargs='?',
                     metavar='platform')

src/module/deploy_utils.py

@@ -131,14 +131,18 @@ def bsh_deploy(arch, url, version, usr = None, pswd = None):
     return res
 
 
-def deploy_list():
+def deploy_list(usr_platform = None):
     """ Simple function for dumping all deployers for supported
     platforms.  This lists them in the format INTERFACE (name), where
     name is used for matching.
     """
 
     for platform in state.supported_platforms:
 
+        # check for a specified platform
+        if usr_platform != 'All' and usr_platform != platform:
+            continue
+
         utility.Msg("Deployers for '%s'" % platform, LOG.UPDATE)
         load = importlib.import_module('src.platform.%s.deployers' % platform)
 
@@ -153,7 +157,8 @@ def deploy_list():
             try:
                 dp = deployer[0].find_module(deployer[1]).load_module(deployer[1])
                 if 'Any' in dp.versions: dp.versions.remove("Any") # used for FP only
-                utility.Msg("\t%s (%s [%s])" % (dp.title, deployer[1], '|'.join(dp.versions)))
+                utility.Msg("\t%s (%s [%s])" % (dp.title, deployer[1], 
+                                                '|'.join(dp.versions)))
 
             except Exception, e:
                 utility.Msg(e, LOG.DEBUG)