Fixed, improved tags and extra parameter support

Author: Dougal Ballantyne

cli/cfncluster/cfnconfig.py

@@ -248,3 +248,14 @@ def __init__(self, args):
         except AttributeError:
             pass
 
+        if self.args.extra_parameters is not None:
+            try:
+                self.parameters = dict(self.parameters)
+                self.__temp_dict = dict(self.parameters.items() + self.args.extra_parameters.items())
+                self.__dictlist = []
+                for key, value in self.__temp_dict.iteritems():
+                    temp = [str(key),str(value)]
+                    self.__dictlist.append(temp)
+                self.parameters = self.__dictlist
+            except AttributeError:
+                pass

cli/cfncluster/cli.py

@@ -13,6 +13,7 @@
 import argparse
 import logging
 import platform
+import json
 
 import cfncluster
 
@@ -81,9 +82,9 @@ def main():
                          help='specify a URL for a custom cloudformation template')
     pcreate.add_argument("--cluster-template", "-t", type=str, dest="cluster_template", default=None,
                          help='specify a specific cluster template to use')
-    pcreate.add_argument("--extra-parameters", "-p", type=str, dest="extra_parameters", default=None,
+    pcreate.add_argument("--extra-parameters", "-p", type=json.loads, dest="extra_parameters", default=None,
                          help='add extra parameters to stack create')
-    pcreate.add_argument("--tags", "-g", type=str, dest="tags", default=None,
+    pcreate.add_argument("--tags", "-g", type=json.loads, dest="tags", default=None,
                          help='tags to be added to the stack')
     pcreate.set_defaults(func=create)