From b696c2a57821e0e1fe18400016c906b92f8c271e Mon Sep 17 00:00:00 2001
From: Ben Howard <ben.howard@canonical.com>
Date: Fri, 31 Aug 2012 12:45:40 -0600
Subject: - Converted user list to user dict to allow exclusion of the default
 user     on Ubuntu systems via cloud-config (LP: #1041384).

- Fixed bug with user creation on Ubuntu where the default user groups are
    not set properly (LP: #1044044).

- Fixed documentation for user creation (LP: #1044508).
---
 doc/examples/cloud-config-user-groups.txt | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/examples/cloud-config-user-groups.txt b/doc/examples/cloud-config-user-groups.txt
index 04f01719..a5dd1455 100644
--- a/doc/examples/cloud-config-user-groups.txt
+++ b/doc/examples/cloud-config-user-groups.txt
@@ -7,6 +7,7 @@ groups:
 
 # add users to the system. Users are added after groups are added.
 users:
+  - default
   - name: foobar
     gecos: Foo B. Bar
     primary-group: foobar
@@ -24,12 +25,13 @@ users:
     ssh-authorized-keys:
       - <ssh pub key 1>
       - <ssh pub key 2>
-  cloudy:
+  - name cloudy
     gecos: Magic Cloud App Daemon User
     inactive: true
     system: true
 
 # Valid Values:
+#   name: The user's login name
 #   gecos: The user name's real name, i.e. "Bob B. Smith"
 #   homedir: Optional. Set to the local path you want to use. Defaults to
 #           /home/<username>
-- 
cgit v1.2.3


From a90e2802b16b0af7b9cef718d19605e2a0565a8e Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Fri, 31 Aug 2012 15:36:35 -0400
Subject: incorrect example in doc

---
 doc/examples/cloud-config-user-groups.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'doc')

diff --git a/doc/examples/cloud-config-user-groups.txt b/doc/examples/cloud-config-user-groups.txt
index a5dd1455..d0b3e2ff 100644
--- a/doc/examples/cloud-config-user-groups.txt
+++ b/doc/examples/cloud-config-user-groups.txt
@@ -25,7 +25,7 @@ users:
     ssh-authorized-keys:
       - <ssh pub key 1>
       - <ssh pub key 2>
-  - name cloudy
+  - name: cloudy
     gecos: Magic Cloud App Daemon User
     inactive: true
     system: true
-- 
cgit v1.2.3