Skip to content
This repository has been archived by the owner on Jan 19, 2022. It is now read-only.

Cross account IAM deployment #74

Merged
merged 6 commits into from
Apr 14, 2015
Merged

Cross account IAM deployment #74

merged 6 commits into from
Apr 14, 2015

Commits on Apr 14, 2015

  1. Move dict merge to utils. 

    Moving dictionary deep merge to utils module so that it is easier to
reuse accross classes.
    mattmb committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    99e7f1a View commit details
    Browse the repository at this point in the history

  2. Add include functionality 

    This adds the option to include extra cloudformation json from a static
file. The includes are merged with the template we generate, overwriting
existing keys that clash.
    mattmb committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    5ecb855 View commit details
    Browse the repository at this point in the history

  3. Update README/CHANGELOG

    mattmb committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    9a2a898 View commit details
    Browse the repository at this point in the history

  4. Support AWS role assumption 

    This adds an extra bit of code to the AWS api connection utility so
that it is possible to assume an IAM role from another account (if your
user has the right to). The ARN id of the role to assume is expected as
an environment variable.
    mattmb committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    85fa1e1 View commit details
    Browse the repository at this point in the history

  5. Append bootstrap-cfn path in salt_utils.py 

    This adds the path explicitly in the salt_utils module so that a user
with limited access does not have to set their PYTHONPATH.
    mattmb committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    7cc58f6 View commit details
    Browse the repository at this point in the history

  6. Fix include merging. 

    This commit fixes a couple of mistakes in the merging code for included
cloudformation templates. It also makes the documentation clearer on how
the merge works.
    mattmb committed Apr 14, 2015
    Configuration menu
    Copy the full SHA
    21d6a8e View commit details
    Browse the repository at this point in the history