Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update ec2.py #63260

Merged
merged 5 commits into from
Oct 10, 2019
Merged

Update ec2.py #63260

merged 5 commits into from
Oct 10, 2019

Conversation

rulai-jianfang
Copy link
Contributor

SUMMARY

Change the explanation of spot_wait_timeout

ISSUE TYPE
  • Docs Pull Request

+label: docsite_pr

SUMMARY
ISSUE TYPE
  • Bugfix Pull Request
  • Docs Pull Request
  • Feature Pull Request
  • New Module Pull Request
COMPONENT NAME
ADDITIONAL INFORMATION

##### SUMMARY
Change the explanation of spot_wait_timeout


##### ISSUE TYPE
- Docs Pull Request

+label: docsite_pr
@ansibot
Copy link
Contributor

ansibot commented Oct 8, 2019

@ansibot
Copy link
Contributor

ansibot commented Oct 8, 2019

@rulai-jianfang, just so you are aware we have a dedicated Working Group for aws.
You can find other people interested in this in #ansible-aws on Freenode IRC
For more information about communities, meetings and agendas see https://github.com/ansible/community

click here for bot help

@ansibot ansibot added affects_2.10 This issue/PR affects Ansible v2.10 aws cloud core_review In order to be merged, this PR must follow the core review workflow. docs This issue/PR relates to or includes documentation. module This issue/PR relates to a module. needs_triage Needs a first human triage before being processed. new_contributor This PR is the first contribution by a new community member. small_patch support:core This issue/PR relates to code supported by the Ansible Engineering Team. labels Oct 8, 2019
@ansibot
Copy link
Contributor

ansibot commented Oct 8, 2019

The test ansible-test sanity --test pep8 [explain] failed with 1 error:

lib/ansible/modules/cloud/amazon/ec2.py:121:161: E501: line too long (193 > 160 characters)

click here for bot help

@ansibot ansibot added ci_verified Changes made in this PR are causing tests to fail. needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. and removed core_review In order to be merged, this PR must follow the core review workflow. labels Oct 8, 2019
Fix Shippable error
@ansibot ansibot removed the ci_verified Changes made in this PR are causing tests to fail. label Oct 8, 2019
Limit length to 168
Fixed line length over 168 error
@ansibot ansibot added core_review In order to be merged, this PR must follow the core review workflow. and removed needs_revision This PR fails CI tests or a maintainer has requested a review/revision of the PR. labels Oct 9, 2019
Copy link
Contributor

@acozine acozine left a comment

Choose a reason for hiding this comment

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

Using the present tense follows the Ansible documentation Style Guide. I should also make the line short enough to pass the line-length sanity test.

lib/ansible/modules/cloud/amazon/ec2.py Outdated Show resolved Hide resolved
@acozine acozine removed the needs_triage Needs a first human triage before being processed. label Oct 9, 2019
Co-Authored-By: Alicia Cozine <879121+acozine@users.noreply.github.com>
@ansibot ansibot removed the new_contributor This PR is the first contribution by a new community member. label Oct 9, 2019
@samccann samccann merged commit 719170e into ansible:devel Oct 10, 2019
@samccann
Copy link
Contributor

Thanks @rulai-jianfang for the Ansible documentation fix!

acozine pushed a commit to acozine/ansible that referenced this pull request Oct 15, 2019
Change the explanation of spot_wait_timeout

(cherry picked from commit 719170e)
acozine added a commit that referenced this pull request Oct 16, 2019
* Update stat.py (#63289)
Reword awkward documentation language.

(cherry picked from commit b46299f)

* Update win_disk_facts.py example (#63266)
Fix incorrect index for second disk (should be `disks[1]` not `disks[0]`)

(cherry picked from commit ce1c8c2)

* Fix broken link (#63185)

(cherry picked from commit 021d095)

* Typo on line 161 (#63133)
fix module name for azure_rm_manageddisk in one example

(cherry picked from commit 81a6146)

* docs: add Centos and Ubuntu to examples for playbook conditionals (#63085)

Co-Authored-By: Sandra McCann <samccann@redhat.com>
(cherry picked from commit 19587b3)

* Spot instance code error (#63246)
Adds 'instance_initiated_shutdown_behavior: terminate' to spot instance example for greater efficiency.

(cherry picked from commit 5ed163c)

* Pass a JSON file to the Lambda's payload (#63261)
* Add an example of passing a JSON file to the Lambda's payload
Events passed to Lambda are commonly in JSON format, the change provides an example of using JSON file as an alternative to the inline YAML payload in the other examples.

(cherry picked from commit 1d5206f)

* Update ec2.py (#63260)
Change the explanation of spot_wait_timeout

(cherry picked from commit 719170e)

* fix aruba_config examples (#63136)

(cherry picked from commit 6ff5968)

* [ec2_launch_template] Update examples (#63152)
- Update tasks names for existing examples
- Add a new example showing how to delete a launch template

(cherry picked from commit 32980f2)
@dagwieers dagwieers added the docsite_pr This PR is created from documentation using the "Edit on GitHub" link. label Oct 26, 2019
@ansible ansible locked and limited conversation to collaborators Nov 13, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
affects_2.10 This issue/PR affects Ansible v2.10 aws cloud core_review In order to be merged, this PR must follow the core review workflow. docs This issue/PR relates to or includes documentation. docsite_pr This PR is created from documentation using the "Edit on GitHub" link. module This issue/PR relates to a module. support:core This issue/PR relates to code supported by the Ansible Engineering Team.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants