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

[inventory_aws_conformance] fix the order of list variables created in config since it otherwise varies (#54365)

Browse source 
modify mock for boto to reflect the new fixed order for the config
This commit is contained in:
Sloane Hertel 2019-03-26 11:18:05 -05:00 committed by GitHub
parent 6996926d89
commit a47edc9968
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
test/integration/targets/inventory_aws_conformance/lib/boto/mocks/instances.py
View file

@ -179,7 +179,7 @@ class InstanceBase(object):
def __init__(self, stopped=False): def __init__(self, stopped=False):
# set common ignored attribute to make sure instances have identical tags and security groups # set common ignored attribute to make sure instances have identical tags and security groups
self._ignore_security_groups = { self._ignore_security_groups = {
'sg-0e1d2bd02b45b712e': 'sgname-with-hyphens', 'sg-0e1d2bd02b45b712e': 'a-sgname-with-hyphens',
'sg-ae5c262eb5c4d712e': 'name@with?invalid!chars' 'sg-ae5c262eb5c4d712e': 'name@with?invalid!chars'
} }
self._ignore_tags = { self._ignore_tags = {

4
test/integration/targets/inventory_aws_conformance/runme.sh
View file

@ -87,8 +87,8 @@ compose:
ec2_placement: placement['availability_zone'] ec2_placement: placement['availability_zone']
ec2_ramdisk: ramdisk_id | default("") ec2_ramdisk: ramdisk_id | default("")
ec2_reason: state_transition_reason ec2_reason: state_transition_reason
ec2_security_group_ids: security_groups | map(attribute='group_id') | list | join(',') ec2_security_group_ids: security_groups | map(attribute='group_id') | list | sort | join(',')
ec2_security_group_names: security_groups | map(attribute='group_name') | list | join(',') ec2_security_group_names: security_groups | map(attribute='group_name') | list | sort | join(',')
ec2_state: state['name'] ec2_state: state['name']
ec2_state_code: state['code'] ec2_state_code: state['code']
ec2_state_reason: state_reason['message'] if state_reason is defined else "" ec2_state_reason: state_reason['message'] if state_reason is defined else ""