From 0049b6e7bc7f52fd442f1b8902294ca8c379df5c Mon Sep 17 00:00:00 2001
From: Joshua Harlow <harlowja@yahoo-inc.com>
Date: Thu, 20 Sep 2012 17:26:42 -0700
Subject: Remove the need to have 'default_user' and 'default_user_groups'
 groups be hard coded into the distro class, instead let that set of
 configuration be located in the config file where it should be specified
 instead.

---
 config/cloud.cfg | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

(limited to 'config')

diff --git a/config/cloud.cfg b/config/cloud.cfg
index b3411d11..fbf53bd5 100644
--- a/config/cloud.cfg
+++ b/config/cloud.cfg
@@ -1,7 +1,9 @@
 # The top level settings are used as module
 # and system configuration.
 
-# Implement for Ubuntu only: create the default 'ubuntu' user
+# A set of users which may be applied and/or used by various modules
+# when a 'default' entry is found it will reference the 'default_user'
+# from the distro configuration specified below
 users:
    - default
 
@@ -71,6 +73,19 @@ cloud_final_modules:
 system_info:
    # This will affect which distro class gets used
    distro: ubuntu
+   # Default user name + that default users groups (if added/used)
+   default_user: ubuntu
+   default_user_groups: 
+     - adm
+     - audio
+     - cdrom
+     - dialout
+     - floppy
+     - video
+     - plugdev
+     - dip
+     - netdev
+     - sudo
    # Other config here will be given to the distro class and/or path classes
    paths:
       cloud_dir: /var/lib/cloud/
-- 
cgit v1.2.3


From 182bf60757b76f86ffb4e5ee9aebcc8ce0fcc74f Mon Sep 17 00:00:00 2001
From: Scott Moser <smoser@ubuntu.com>
Date: Tue, 23 Oct 2012 06:35:58 -0400
Subject: tweak default ubuntu user

---
 config/cloud.cfg | 3 ---
 1 file changed, 3 deletions(-)

(limited to 'config')

diff --git a/config/cloud.cfg b/config/cloud.cfg
index efa0fa36..f6c9065a 100644
--- a/config/cloud.cfg
+++ b/config/cloud.cfg
@@ -76,9 +76,6 @@ system_info:
    # Default user name + that default users groups (if added/used)
    default_user:
      name: Ubuntu
-     plain_text_passwd: 'ubuntu'
-     home: /home/ubuntu
-     shell: /bin/bash
      lock_passwd: True
      gecos: Ubuntu
      groups: [adm, audio, cdrom, dialout, floppy, video, plugdev, dip, netdev]
-- 
cgit v1.2.3