Merge ~slystopad/cloud-init:fix/LP1665773 into cloud-init:master

Proposed by Serg Lystopad
Status: Merged
Approved by: Scott Moser
Approved revision: f935f23ea3978127efcf844a85e4668f918b43b8
Merged at revision: 5a0bee770fe80573e8efad9ca97233079adebd78
Proposed branch: ~slystopad/cloud-init:fix/LP1665773
Merge into: cloud-init:master
Diff against target: 21 lines (+5/-5)
1 file modified
cloudinit/config/cc_set_passwords.py (+5/-5)
Reviewer Review Type Date Requested Status
Server Team CI bot continuous-integration Needs Fixing
cloud-init Commiters Pending
Review via email: mp+317681@code.launchpad.net

Commit message

doc: Fix configuration example for cc_set_passwords module.

The documentation had 'chpasswd/list' as a list when the code only takes
it as a string.

LP: #1665773

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:f935f23ea3978127efcf844a85e4668f918b43b8
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/~slystopad/cloud-init/+git/cloud-init/+merge/317681/+edit-commit-message

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

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/server/job/cloud-init-ci/79/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/config/cc_set_passwords.py b/cloudinit/config/cc_set_passwords.py
2index cf1f59e..af6704c 100755
3--- a/cloudinit/config/cc_set_passwords.py
4+++ b/cloudinit/config/cc_set_passwords.py
5@@ -45,11 +45,11 @@ enabled, disabled, or left to system defaults using ``ssh_pwauth``.
6 expire: <true/false>
7
8 chpasswd:
9- list:
10- - user1:password1
11- - user2:Random
12- - user3:password3
13- - user4:R
14+ list: |
15+ user1:password1
16+ user2:Random
17+ user3:password3
18+ user4:R
19 """
20
21 import sys

Subscribers

People subscribed via source and target branches