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

Add CF config to salt pillar. #45

Merged
merged 2 commits into from
Mar 24, 2015
Merged

Add CF config to salt pillar. #45

merged 2 commits into from
Mar 24, 2015

Conversation

mattmb
Copy link
Contributor

@mattmb mattmb commented Mar 23, 2015

This uploads the stack config to cloudformtaion.sls in the salt pillar dir. This way it can be included in the pillar in the deploy repositories and referenced in the salt templates.

@@ -93,7 +93,7 @@ def get_config():

cfn_config = ConfigParser(project_config.config, get_stack_name())
cfn = Cloudformation(aws_config)
return aws_config, cfn, cfn_config
return aws_config, cfn, cfn_config, project_config
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hmmmm this is fast going beyond the point of readability/maintainability.

We need to come up with a better solution to this.

@stuartornum
Copy link
Contributor

Can you update the example config files and README please

'cloudformation.sls'),
local_path=tfile_path,
use_sudo=True)
os.unlink(tfile_path)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we really have to create a temporary file to do this? Can we pass a StringIO object instead?

local_path may alternately be a file-like object, such as the result of open('path') or a StringIO instance.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ooo, that would be nicer, will give it a try.

@mattmb
Copy link
Contributor Author

mattmb commented Mar 23, 2015

@stuartornum shouldn't need to change the example config. Good shout on the README. I need to update the CHANGELOG too.

@stuartornum
Copy link
Contributor

The example yaml's have no reference to salt - so I don't know (without going through the code) what the salt structure should look like

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.47%) to 46.45% when pulling 4f3575c on feature/salt-pillar into aecbe0f on master.

This uploads the stack config to cloudformtaion.sls in the salt
pillar dir. This way it can be included in the pillar in the deploy
repositories and referenced in the salt templates.
@mattmb mattmb force-pushed the feature/salt-pillar branch 2 times, most recently from 7089437 to 4f55d77 Compare March 24, 2015 15:11
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.41%) to 48.15% when pulling bde1683 on feature/salt-pillar into e913f02 on master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.41%) to 48.15% when pulling bde1683 on feature/salt-pillar into e913f02 on master.

@coveralls
Copy link

Coverage Status

Coverage decreased (-0.41%) to 48.15% when pulling bde1683 on feature/salt-pillar into e913f02 on master.

stuartornum added a commit that referenced this pull request Mar 24, 2015
@stuartornum stuartornum merged commit ca77a00 into master Mar 24, 2015
@stuartornum stuartornum deleted the feature/salt-pillar branch March 24, 2015 15:34
@coveralls
Copy link

Coverage Status

Coverage decreased (-0.41%) to 48.15% when pulling bde1683 on feature/salt-pillar into e913f02 on master.

Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants