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

ec2 inventory: python 3.7 compatibility (#43716)

Browse source 
ec2 inventory script was throwing errors when using Python 3.7:

TypeError: option values must be strings

This changes the None ConfigParser options to empty strings instead.

(cherry picked from commit 505ce6ccf6)
This commit is contained in:
Simon Wydooghe 2018-09-05 01:27:35 +02:00 committed by Toshio Kuratomi
parent cc4854fdad
commit c89d9d5c8f
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
contrib/inventory/ec2.py
View file

@ -187,16 +187,16 @@ DEFAULTS = {
'all_elasticache_replication_groups': 'False', 'all_elasticache_replication_groups': 'False',
'all_instances': 'False', 'all_instances': 'False',
'all_rds_instances': 'False', 'all_rds_instances': 'False',
'aws_access_key_id': None, 'aws_access_key_id': '',
'aws_secret_access_key': None, 'aws_secret_access_key': '',
'aws_security_token': None, 'aws_security_token': '',
'boto_profile': None, 'boto_profile': '',
'cache_max_age': '300', 'cache_max_age': '300',
'cache_path': '~/.ansible/tmp', 'cache_path': '~/.ansible/tmp',
'destination_variable': 'public_dns_name', 'destination_variable': 'public_dns_name',
'elasticache': 'True', 'elasticache': 'True',
'eucalyptus': 'False', 'eucalyptus': 'False',
'eucalyptus_host': None, 'eucalyptus_host': '',
'expand_csv_tags': 'False', 'expand_csv_tags': 'False',
'group_by_ami_id': 'True', 'group_by_ami_id': 'True',
'group_by_availability_zone': 'True', 'group_by_availability_zone': 'True',
@ -218,19 +218,19 @@ DEFAULTS = {
'group_by_tag_keys': 'True', 'group_by_tag_keys': 'True',
'group_by_tag_none': 'True', 'group_by_tag_none': 'True',
'group_by_vpc_id': 'True', 'group_by_vpc_id': 'True',
'hostname_variable': None, 'hostname_variable': '',
'iam_role': None, 'iam_role': '',
'include_rds_clusters': 'False', 'include_rds_clusters': 'False',
'nested_groups': 'False', 'nested_groups': 'False',
'pattern_exclude': None, 'pattern_exclude': '',
'pattern_include': None, 'pattern_include': '',
'rds': 'False', 'rds': 'False',
'regions': 'all', 'regions': 'all',
'regions_exclude': 'us-gov-west-1, cn-north-1', 'regions_exclude': 'us-gov-west-1, cn-north-1',
'replace_dash_in_groups': 'True', 'replace_dash_in_groups': 'True',
'route53': 'False', 'route53': 'False',
'route53_excluded_zones': '', 'route53_excluded_zones': '',
'route53_hostnames': None, 'route53_hostnames': '',
'stack_filters': 'False', 'stack_filters': 'False',
'vpc_destination_variable': 'ip_address' 'vpc_destination_variable': 'ip_address'
} }