Merge bde1683 into e913f02

CHANGELOG.md

@@ -8,6 +8,7 @@
  * Add conditional statement in fabfile to check for ssl cert on roll back before trying to delete it.
  * Refactor fab_tasks get_config method to not return *every* config item. Also PEP8 fixes and removing unused functions.
  * Change security group input to dictionary so we can create multiple groups that reference each other.
+ * Include cloudformation config in salt pillar.
 
 ## Version 0.1
 

README.rst

@@ -173,6 +173,13 @@ In order to rsync your salt states to the salt master you need to add a `salt` s
     **Default value**: /srv/salt
 - **remote_pillar_dir**: Pillar root on the master.
     **Default value**: /srv/pillar
+
+The cloudformation yaml will be automatically uploaded to your pillar as cloudformation.sls. So if you include ``-cloudformation`` in your pillar top file you can do things like:
+
+::
+
+    salt-call pillar.get s3:static-bucket-name
+
 SSL certs for ELBs
 ++++++++++++++++++++
 

bootstrap_cfn/fab_tasks.py

@@ -2,14 +2,16 @@
 
 import sys
 import random
+import yaml
 from bootstrap_cfn.config import AWSConfig, ProjectConfig, ConfigParser
 from bootstrap_cfn.cloudformation import Cloudformation
 from bootstrap_cfn.ec2 import EC2
 from bootstrap_cfn.iam import IAM
 
 import os
+from StringIO import StringIO
 
-from fabric.api import env, task, sudo
+from fabric.api import env, task, sudo, put
 from fabric.contrib.project import upload_project
 
 # GLOBAL VARIABLES
@@ -96,13 +98,11 @@ def get_config():
     cfn_config = ConfigParser(project_config.config, get_stack_name())
     return cfn_config
 
-
 def get_connection(klass):
     _validate_fabric_env()
     aws_config = AWSConfig(env.aws)
     return klass(aws_config)
 
-
 @task
 def cfn_delete(force=False):
     if not force:
@@ -261,6 +261,7 @@ def rsync():
     work_dir = os.path.join('..', '{0}-deploy'.format(env.application))
 
     project_config = ProjectConfig(env.config, env.environment)
+    stack_name = get_stack_name()
     cfg = project_config.config
     salt_cfg = cfg.get('salt', {})
 
@@ -300,3 +301,10 @@ def rsync():
         remote_dir=remote_pillar_dir,
         local_dir=os.path.join(local_pillar_dir, env.environment, '.'),
         use_sudo=True)
+    cf_sls = StringIO(yaml.dump(cfg))
+    put(
+        remote_path=os.path.join(
+            remote_pillar_dir,
+            'cloudformation.sls'),
+        local_path=cf_sls,
+        use_sudo=True)