cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

ec2_group: do not fail on description mismatch (#31704) (#31734)

Browse source 
* ec2_group: do not fail on description mismatch (#31704)

* ec2_group: do not fail on description mismatch (#31704) - fix test case
This commit is contained in:
Marek Nogacki 2017-10-18 15:21:55 +02:00 committed by Sloane Hertel
parent 1b63885fc5
commit b9223cdc89
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/ansible/modules/cloud/amazon/ec2_group.py
View file

@ -682,8 +682,8 @@ def main():
if group:
# existing group
if group['Description'] != description:
module.fail_json(
msg="Group description does not match existing group. ec2_group does not support this case.")
module.warn("Group description does not match existing group. Descriptions cannot be changed without deleting "
"and re-creating the security group. Try using state=absent to delete, then rerunning this task.")
# if the group doesn't exist, create it now
else:

8
test/integration/targets/ec2_group/tasks/main.yml
View file

@ -192,7 +192,7 @@
- 'result.group_id.startswith("sg-")'
# ============================================================
- name: test state=present different description raises error
- name: test state=present different description (expected changed=false)
ec2_group:
name: '{{ec2_group_name}}'
description: '{{ec2_group_description}}CHANGED'
@ -204,11 +204,11 @@
ignore_errors: true
register: result
- name: assert matching group with non-matching description raises error
- name: assert state=present (expected changed=false)
assert:
that:
- 'result.failed'
- '"Group description does not match existing group. ec2_group does not support this case." in result.msg'
- 'not result.changed'
- 'result.group_id.startswith("sg-")'
# ============================================================
- name: test state=present (expected changed=false)