saltstack/salt
1
0
Fork 0
mirror of https://github.com/saltstack/salt.git synced 2025-04-17 10:10:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #30245 from rallytime/botosecgroup-docs

Browse source 
Boto secgroup/iam_role: Add note stating us-east-1 is default region
This commit is contained in:
Mike Place 2016-01-12 13:04:31 -07:00
commit dbe7bcdc9a
2 changed files with 18 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
salt/states/boto_iam_role.py
View file

@ -76,6 +76,15 @@ with the role. This is the default behavior of the AWS console.
If ``delete_policies: False`` is specified, existing policies that are not in
the given list of policies will not be deleted. This allows manual modifications
on the IAM role to be persistent. This functionality was added in 2015.8.0.
.. note::
When using the ``profile`` parameter and ``region`` is set outside of
the profile group, region is ignored and a default region will be used.
If ``region`` is missing from the ``profile`` data set, ``us-east-1``
will be used as the default region.
'''
from __future__ import absolute_import
import salt.utils.dictupdate as dictupdate

9
salt/states/boto_secgroup.py
View file

@ -78,6 +78,15 @@ passed in as a dict, or as a string to pull from pillars or minion config:
keyid: GKTADJGHEIQSXMKKRBJ08H
key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs
region: us-east-1
.. note::
When using the ``profile`` parameter and ``region`` is set outside of
the profile group, region is ignored and a default region will be used.
If ``region`` is missing from the ``profile`` data set, ``us-east-1``
will be used as the default region.
'''
from __future__ import absolute_import