cloud-init

Merge ~smoser/cloud-init:fix/ec2-invert-exception_cb-logic into cloud-init:master

  1. Git
  2. lp:~smoser/cloud-init
  3. fix/ec2-invert-exception_cb-logic
  4. Merge into master
Proposed by Scott Moser
Status: Merged
Approved by: Chad Smith
Approved revision: 7b7653cb4b46f03c4615ae70960f84778ac33a85
Merge reported by: Chad Smith
Merged at revision: 10065b1e5f0867978bb10472f609aa9238311367
Proposed branch: ~smoser/cloud-init:fix/ec2-invert-exception_cb-logic
Merge into: cloud-init:master
Diff against target: 17 lines (+2/-4)
1 file modified
cloudinit/ec2_utils.py (+2/-4)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Approve
Chad Smith Approve
Review via email: mp+341998@code.launchpad.net

Commit message

ec2: Adjust ec2 datasource after exception_cb change.

The recent change to exception_cb missed this caller.
The result was a slow test.

To post a comment you must log in.
Revision history for this message
Chad Smith (chad.smith) wrote :

+1

review: Approve
Revision history for this message
Chad Smith (chad.smith) wrote :

An upstream commit landed for this bug.

To view that commit see the following URL:
https://git.launchpad.net/cloud-init/commit/?id=10065b1e

Revision history for this message
Server Team CI bot (server-team-bot) wrote :

PASSED: Continuous integration, rev:7b7653cb4b46f03c4615ae70960f84778ac33a85
https://jenkins.ubuntu.com/server/job/cloud-init-ci/917/
Executed test runs:
    SUCCESS: Checkout
    SUCCESS: Unit & Style Tests
    SUCCESS: Ubuntu LTS: Build
    SUCCESS: Ubuntu LTS: Integration
    SUCCESS: MAAS Compatability Testing
    IN_PROGRESS: Declarative: Post Actions

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/917/rebuild

review: Approve (continuous-integration)

There was an error fetching revisions from git servers. Please try again in a few minutes. If the problem persists, contact Launchpad support.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/ec2_utils.py b/cloudinit/ec2_utils.py
2index d6c61e4..dc3f0fc 100644
3--- a/cloudinit/ec2_utils.py
4+++ b/cloudinit/ec2_utils.py
5@@ -135,10 +135,8 @@ class MetadataMaterializer(object):
6
7
8 def _skip_retry_on_codes(status_codes, _request_args, cause):
9- """Returns if a request should retry based on a given set of codes that
10- case retrying to be stopped/skipped.
11- """
12- return cause.code in status_codes
13+ """Returns False if cause.code is in status_codes."""
14+ return cause.code not in status_codes
15
16
17 def get_instance_userdata(api_version='latest',

Subscribers

People subscribed via source and target branches