Adding cfn_proxy variable, CLITemplate parameters and small sleep for deletes.

Author: dougalb

cli/cfncluster/cfncluster.py

@@ -305,6 +305,7 @@ def delete(args):
                                                     aws_secret_access_key=config.aws_secret_access_key)
     try:
         cfnconn.delete_stack(stack)
+        time.sleep(5)
         status = cfnconn.describe_stacks(stack)[0].stack_status
         sys.stdout.write('\rStatus: %s' % status)
         sys.stdout.flush()

cli/cfncluster/cfnconfig.py

@@ -59,6 +59,7 @@ def __init__(self, args):
         except AttributeError:
             self.__cluster_template = __config.get('global', 'cluster_template')
         self.__cluster_section = ('cluster %s' % self.__cluster_template)
+        self.parameters.append(('CLITemplate',self.__cluster_template))
 
         # Check if package updates should be checked
         try:

cloudformation/cfncluster.cfn.json

@@ -1339,6 +1339,11 @@
                         "Ref" : "EphemeralDir"
                       },
                       "\n",
+                      "cfn_proxy=",
+                      {
+                        "Ref" : "ProxyServer"
+                      },
+                      "\n",
                       "cfn_node_type=MasterServer\n",
                       "cfn_cluster_user=",
                       {
@@ -1720,6 +1725,11 @@
                         "Ref" : "SQS"
                       },
                       "\n",
+                      "cfn_proxy=",
+                      {
+                        "Ref" : "ProxyServer"
+                      },
+                      "\n",
                       "cfn_master=",
                       {
                         "Fn::GetAtt" : [