cloud-init-dev team mailing list archive

[Robert C Jennings <robert.jennings@xxxxxxxxxxxxx>]

Robert C Jennings has proposed merging lp:~rcj/cloud-init/lock_passwd-doc-fix into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~rcj/cloud-init/lock_passwd-doc-fix/+merge/284486
-- 
Your team cloud init development team is requested to review the proposed merge of lp:~rcj/cloud-init/lock_passwd-doc-fix into lp:cloud-init.

=== modified file 'doc/examples/cloud-config-user-groups.txt'
--- doc/examples/cloud-config-user-groups.txt	2014-06-10 00:38:09 +0000
+++ doc/examples/cloud-config-user-groups.txt	2016-01-29 17:49:16 +0000
@@ -15,14 +15,14 @@
     selinux-user: staff_u
     expiredate: 2012-09-01
     ssh-import-id: foobar
-    lock-passwd: false
+    lock_passwd: false
     passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/
   - name: barfoo
     gecos: Bar B. Foo
     sudo: ALL=(ALL) NOPASSWD:ALL
     groups: users, admin
     ssh-import-id: None
-    lock-passwd: true
+    lock_passwd: true
     ssh-authorized-keys:
       - <ssh pub key 1>
       - <ssh pub key 2>
@@ -42,7 +42,7 @@
 #   selinux-user:  Optional. The SELinux user for the user's login, such as
 #           "staff_u". When this is omitted the system will select the default
 #           SELinux user.
-#   lock-passwd: Defaults to true. Lock the password to disable password login
+#   lock_passwd: Defaults to true. Lock the password to disable password login
 #   inactive: Create the user as inactive
 #   passwd: The hash -- not the password itself -- of the password you want
 #           to use for this user. You can generate a safe hash via: