Merge ~larsks/cloud-init:bug/retries-typo into cloud-init:master

Proposed by Lars Kellogg-Stedman
Status: Merged
Approved by: Scott Moser
Approved revision: b1bb268e45b45cce80a2630a20f0b1dd7c02bfff
Merged at revision: 9a178611b89ca198145c200718ab8f205ece398c
Proposed branch: ~larsks/cloud-init:bug/retries-typo
Merge into: cloud-init:master
Diff against target: 12 lines (+1/-1)
1 file modified
cloudinit/sources/DataSourceOpenStack.py (+1/-1)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Needs Fixing
Scott Moser Pending
Review via email: mp+323948@code.launchpad.net

Commit message

openstack: fix log message copy/paste typo in _get_url_settings

There was a copy/paste error in _get_url_settings such that the error
message would complain about max wait when in fact it was talking
about retries.

To post a comment you must log in.
Revision history for this message
Server Team CI bot (server-team-bot) wrote :

FAILED: Continuous integration, rev:b1bb268e45b45cce80a2630a20f0b1dd7c02bfff
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~larsks/cloud-init/+git/cloud-init/+merge/323948/+edit-commit-message

https://jenkins.ubuntu.com/server/job/cloud-init-ci/324/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-amd64/324
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-arm64/324
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=metal-ppc64el/324
    SUCCESS: https://jenkins.ubuntu.com/server/job/cloud-init-ci/nodes=vm-i386/324

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

review: Needs Fixing (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/cloudinit/sources/DataSourceOpenStack.py b/cloudinit/sources/DataSourceOpenStack.py
2index f0a6bfc..b64a7f2 100644
3--- a/cloudinit/sources/DataSourceOpenStack.py
4+++ b/cloudinit/sources/DataSourceOpenStack.py
5@@ -60,7 +60,7 @@ class DataSourceOpenStack(openstack.SourceMixin, sources.DataSource):
6 try:
7 retries = int(self.ds_cfg.get("retries", retries))
8 except Exception:
9- util.logexc(LOG, "Failed to get max wait. using %s", retries)
10+ util.logexc(LOG, "Failed to get retries. using %s", retries)
11
12 return (max_wait, timeout, retries)
13

Subscribers

People subscribed via source and target branches