Merge lp://qastaging/~smoser/ubuntu/trusty/cloud-init/trusty-1461242 into lp://qastaging/ubuntu/trusty/cloud-init

Proposed by Scott Moser
Status: Merged
Merged at revision: 351
Proposed branch: lp://qastaging/~smoser/ubuntu/trusty/cloud-init/trusty-1461242
Merge into: lp://qastaging/ubuntu/trusty/cloud-init
Diff against target: 411 lines (+294/-31)
6 files modified
.pc/applied-patches (+1/-0)
.pc/lp-1461242-generate-ed25519-host-keys.patch/cloudinit/config/cc_ssh.py (+138/-0)
cloudinit/config/cc_ssh.py (+33/-30)
debian/changelog (+6/-1)
debian/patches/lp-1461242-generate-ed25519-host-keys.patch (+115/-0)
debian/patches/series (+1/-0)
To merge this branch: bzr merge lp://qastaging/~smoser/ubuntu/trusty/cloud-init/trusty-1461242
Reviewer Review Type Date Requested Status
Ben Howard (community) Approve
Dan Watkins Pending
Review via email: mp+270711@code.qastaging.launchpad.net
To post a comment you must log in.
352. By Scott Moser

remove use of 'decode_binary'

there is no 'decode_binary' here.
the return values from subp in python2 are strings.

Revision history for this message
Ben Howard (darkmuggle-deactivatedaccount) wrote :

Tested and okay for merger. It works as expected by creating ed25519 keys in /etc/ssh.

I would merge it, but bzr is complaining of a "readonly transport."

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: