summaryrefslogtreecommitdiff
path: root/cloudinit/ec2_utils.py
diff options
context:
space:
mode:
authorChristian Ehrhardt <christian.ehrhardt@canonical.com>2016-05-30 13:10:13 +0200
committerChristian Ehrhardt <christian.ehrhardt@canonical.com>2016-05-30 13:10:13 +0200
commitaefffff0e3df98a435133b598217401c3f953cc6 (patch)
tree9a141352c311aa541f93de560fcfec9c0d213476 /cloudinit/ec2_utils.py
parent3c85315373306729443ef79fd8e54af46a7bc849 (diff)
parent0dbe69aa34948d73d5709a7ddc19389e05e1a268 (diff)
downloadvyos-cloud-init-aefffff0e3df98a435133b598217401c3f953cc6.tar.gz
vyos-cloud-init-aefffff0e3df98a435133b598217401c3f953cc6.zip
merge with last upstream to avoid merging conflicts on MP
Diffstat (limited to 'cloudinit/ec2_utils.py')
-rw-r--r--cloudinit/ec2_utils.py4
1 files changed, 1 insertions, 3 deletions
diff --git a/cloudinit/ec2_utils.py b/cloudinit/ec2_utils.py
index 37b92a83..76dda042 100644
--- a/cloudinit/ec2_utils.py
+++ b/cloudinit/ec2_utils.py
@@ -144,9 +144,7 @@ def _skip_retry_on_codes(status_codes, _request_args, cause):
"""Returns if a request should retry based on a given set of codes that
case retrying to be stopped/skipped.
"""
- if cause.code in status_codes:
- return False
- return True
+ return cause.code in status_codes
def get_instance_userdata(api_version='latest',