Merge f8f20ea into c2be12a

CHANGELOG.md

@@ -1,3 +1,6 @@
+##Unreleased
+* Tag stack and created resources created with environment name
+
 ## Version 0.5.3 [WIP]
 * Improve message content when cfn_create raises an exception and fails.
 * Cleanup SSL certificates when cfn_create raises an exception and fails.

bootstrap_cfn/cloudformation.py

@@ -17,10 +17,11 @@ def __init__(self, aws_profile_name, aws_region_name='eu-west-1'):
         self.aws_region_name = aws_region_name
         self.conn_cfn = utils.connect_to_aws(boto.cloudformation, self)
 
-    def create(self, stack_name, template_body):
+    def create(self, stack_name, template_body, tags=[]):
         stack = self.conn_cfn.create_stack(stack_name=stack_name,
                                            template_body=template_body,
-                                           capabilities=['CAPABILITY_IAM'])
+                                           capabilities=['CAPABILITY_IAM'],
+                                           tags=tags)
         return stack
 
     def delete(self, stack_name):

bootstrap_cfn/fab_tasks.py

@@ -344,7 +344,13 @@ def cfn_create(test=False):
     # print cfn_config.process()
     # Inject security groups in stack template and create stacks.
     try:
-        stack = cfn.create(stack_name, cfn_config.process())
+        # Set a top-level set of tags for the stack, these will propagate
+        # down so that many of the created resources will be tagged in
+        # addition. Notable omissions are EC2 volumes and route53 resources
+        tags = {
+            "Env": env.environment
+        }
+        stack = cfn.create(stack_name, cfn_config.process(), tags=tags)
     except:
         # cleanup ssl certificates if any
         if 'ssl' in cfn_config.data: