diff --git a/salt/states/boto_elb.py b/salt/states/boto_elb.py index 362b38a6c4..62360e3d81 100644 --- a/salt/states/boto_elb.py +++ b/salt/states/boto_elb.py @@ -13,9 +13,9 @@ This module uses boto, which can be installed via package, or pip. This module accepts explicit elb credentials but can also utilize IAM roles assigned to the instance trough Instance Profiles. Dynamic credentials are then automatically obtained from AWS API and no further -configuration is necessary. More Information available at:: +configuration is necessary. More Information available at: - http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html +http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html If IAM roles are not used you need to specify them either in a pillar or in the minion's config file:: @@ -26,6 +26,8 @@ in the minion's config file:: It's also possible to specify key, keyid and region via a profile, either as a passed in dict, or as a string to pull from pillars or minion config: +.. code-block:: yaml + myprofile: keyid: GKTADJGHEIQSXMKKRBJ08H key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs diff --git a/salt/states/boto_iam_role.py b/salt/states/boto_iam_role.py index d0ad67a52e..0a04502b0d 100644 --- a/salt/states/boto_iam_role.py +++ b/salt/states/boto_iam_role.py @@ -10,9 +10,9 @@ This module uses boto, which can be installed via package, or pip. This module accepts explicit IAM credentials but can also utilize IAM roles assigned to the instance trough Instance Profiles. Dynamic credentials are then automatically obtained from AWS API and no further -configuration is necessary. More Information available at:: +configuration is necessary. More Information available at: - http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html +http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html If IAM roles are not used you need to specify them either in a pillar or in the minion's config file:: @@ -23,6 +23,8 @@ in the minion's config file:: It's also possible to specify key, keyid and region via a profile, either as a passed in dict, or as a string to pull from pillars or minion config: +.. code-block:: yaml + myprofile: keyid: GKTADJGHEIQSXMKKRBJ08H key: askjghsdfjkghWupUjasdflkdfklgjsdfjajkghs @@ -30,6 +32,7 @@ as a passed in dict, or as a string to pull from pillars or minion config: Creating a role will automatically create an instance profile and associate it with the role. This is the default behavior of the AWS console. + .. code-block:: yaml myrole: diff --git a/salt/states/boto_route53.py b/salt/states/boto_route53.py index 4d5134210a..95943a7521 100644 --- a/salt/states/boto_route53.py +++ b/salt/states/boto_route53.py @@ -13,9 +13,9 @@ This module uses boto, which can be installed via package, or pip. This module accepts explicit route53 credentials but can also utilize IAM roles assigned to the instance trough Instance Profiles. Dynamic credentials are then automatically obtained from AWS API and no further -configuration is necessary. More Information available at:: +configuration is necessary. More Information available at: - http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html +http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html If IAM roles are not used you need to specify them either in a pillar or in the minion's config file:: @@ -26,6 +26,8 @@ in the minion's config file:: It's also possible to specify key, keyid and region via a profile, either as a passed in dict, or as a string to pull from pillars or minion config: +.. code-block:: yaml + myprofile: keyid: GKTADJGHEIQSXMKKRBJ08H key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs diff --git a/salt/states/boto_sqs.py b/salt/states/boto_sqs.py index 69ec9f3338..281f59b748 100644 --- a/salt/states/boto_sqs.py +++ b/salt/states/boto_sqs.py @@ -13,9 +13,9 @@ This module uses boto, which can be installed via package, or pip. This module accepts explicit sqs credentials but can also utilize IAM roles assigned to the instance trough Instance Profiles. Dynamic credentials are then automatically obtained from AWS API and no further -configuration is necessary. More Information available at:: +configuration is necessary. More Information available at: - http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html +http://docs.aws.amazon.com/AWSEC2/latest/UserGuide/iam-roles-for-amazon-ec2.html If IAM roles are not used you need to specify them either in a pillar or in the minion's config file:: @@ -26,6 +26,8 @@ in the minion's config file:: It's also possible to specify key, keyid and region via a profile, either as a passed in dict, or as a string to pull from pillars or minion config: +.. code-block:: yaml + myprofile: keyid: GKTADJGHEIQSXMKKRBJ08H key: askdjghsdfjkghWupUjasdflkdfklgjsdfjajkghs