Merge pull request #160 from michaeltchapman/bff

Add keystone arg to subcommands

stack-builder/clean.py

@@ -15,7 +15,7 @@ from quantumclient.quantum import client as qclient
 from time import sleep
 import os
 
-def kill(n, q, args):
+def kill(n, q, k, args):
     """
     Destroy either all virtual test resources,
     or the resources from a particular run.

stack-builder/fragment.py

@@ -41,7 +41,7 @@ def compose(hostname, yaml_dir, fragment_dir, scenario, replacements):
     script = build_deploy(fragments)
     return PercentTemplate(script).safe_substitute(replacements)
 
-def show(n, q, args):
+def show(n, q, k, args):
     hostname = args.node
     yaml_dir = args.yaml_dir
     fragment_dir = args.fragment_dir

stack-builder/metadata.py

@@ -54,7 +54,7 @@ def build_metadata(path, scenario, config):
     else:
         print "Invalid config type: choose from 'user' and 'conf'"
 
-def show(n, q, args):
+def show(n, q, k, args):
     hostname = args.node
     yaml_dir = args.yaml_dir
     scenario = args.scenario