summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorSimon Wydooghe <simon@wydooghe.com>2018-09-05 01:27:35 +0200
committerWill Thames <will@thames.id.au>2018-09-05 09:27:35 +1000
commit505ce6ccf6e40f67b30fa8a84d9704c28013d841 (patch)
tree1bf09ebd2b0b88e89b859b58e88970ceb11e37cc /contrib
parent26edeb7cce6636fd607b994e64e7476779eeafd2 (diff)
downloadansible-505ce6ccf6e40f67b30fa8a84d9704c28013d841.tar.gz
ec2 inventory: python 3.7 compatibility (#43716)
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.
Diffstat (limited to 'contrib')
-rwxr-xr-xcontrib/inventory/ec2.py20
1 files changed, 10 insertions, 10 deletions
diff --git a/contrib/inventory/ec2.py b/contrib/inventory/ec2.py
index b5108d3756..7ba6142dfe 100755
--- a/contrib/inventory/ec2.py
+++ b/contrib/inventory/ec2.py
@@ -188,16 +188,16 @@ DEFAULTS = {
'all_elasticache_replication_groups': 'False',
'all_instances': 'False',
'all_rds_instances': 'False',
- 'aws_access_key_id': None,
- 'aws_secret_access_key': None,
- 'aws_security_token': None,
- 'boto_profile': None,
+ 'aws_access_key_id': '',
+ 'aws_secret_access_key': '',
+ 'aws_security_token': '',
+ 'boto_profile': '',
'cache_max_age': '300',
'cache_path': '~/.ansible/tmp',
'destination_variable': 'public_dns_name',
'elasticache': 'True',
'eucalyptus': 'False',
- 'eucalyptus_host': None,
+ 'eucalyptus_host': '',
'expand_csv_tags': 'False',
'group_by_ami_id': 'True',
'group_by_availability_zone': 'True',
@@ -219,19 +219,19 @@ DEFAULTS = {
'group_by_tag_keys': 'True',
'group_by_tag_none': 'True',
'group_by_vpc_id': 'True',
- 'hostname_variable': None,
- 'iam_role': None,
+ 'hostname_variable': '',
+ 'iam_role': '',
'include_rds_clusters': 'False',
'nested_groups': 'False',
- 'pattern_exclude': None,
- 'pattern_include': None,
+ 'pattern_exclude': '',
+ 'pattern_include': '',
'rds': 'False',
'regions': 'all',
'regions_exclude': 'us-gov-west-1, cn-north-1',
'replace_dash_in_groups': 'True',
'route53': 'False',
'route53_excluded_zones': '',
- 'route53_hostnames': None,
+ 'route53_hostnames': '',
'stack_filters': 'False',
'vpc_destination_variable': 'ip_address'
}