Merge lp:~smoser/curtin/trunk.lp1520400 into lp:~curtin-dev/curtin/trunk
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 334 | ||||
Proposed branch: | lp:~smoser/curtin/trunk.lp1520400 | ||||
Merge into: | lp:~curtin-dev/curtin/trunk | ||||
Diff against target: |
21 lines (+3/-1) 1 file modified
curtin/url_helper.py (+3/-1) |
||||
To merge this branch: | bzr merge lp:~smoser/curtin/trunk.lp1520400 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Ryan Harper (community) | Approve | ||
Server Team CI bot | continuous-integration | Approve | |
Review via email:
|
Commit message
initial fix for reading skew_data
I picked these from cloud-init revno 1147 that made similar changes. One
thing I don't yet have here is the retries that went in there.
Essentially you have to retry to put the skew in place. In cases where
MAAS is running curtin, cloud-init will have already done that for us
and we'll just read the offset from skew_data_file.
So this should be sufficient for MAAS, which is really the only place
that OAuth is currently used.
There is actually one other set of changes that i'd like to get.
Currently we set the oauth skew, and then use it, but if something
(systemd-timed) updated the clock during these things happening then our
skew could be come wrong. This is described more in bug 1531233.
PASSED: Continuous integration, rev:315 /server- team-jenkins. canonical. com/job/ curtin- ci/87/ /server- team-jenkins. canonical. com/job/ generic- update- mp/84/console
https:/
Executed test runs:
None: https:/
Click here to trigger a rebuild: /server- team-jenkins. canonical. com/job/ curtin- ci/87/rebuild
https:/