From c3256b508334396d78c7faeec255c732faea7fe2 Mon Sep 17 00:00:00 2001
From: Steven Dake <sdake@redhat.com>
Date: Thu, 24 May 2012 17:12:27 -0700
Subject: [PATCH] Allow login to U10 jeos launched from heat

cloudinit on debian expects the user "ubuntu" - hard code to ec2-user
useradd doesn't create home directories on U10 without -m option

Change-Id: Iaaee6df560b60e203b17a36bba57ac410ad6ed56
Signed-off-by: Steven Dake <sdake@redhat.com>
---
 heat/cloudinit/config                 | 3 ++-
 heat/jeos/U10-amd64-cfntools-jeos.tdl | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/heat/cloudinit/config b/heat/cloudinit/config
index a5f2771e08..2efbd19aba 100644
--- a/heat/cloudinit/config
+++ b/heat/cloudinit/config
@@ -1,4 +1,5 @@
-#cloud-config
+user: ec2-user
+
 cloud_config_modules:
  - locale
  - set_hostname
diff --git a/heat/jeos/U10-amd64-cfntools-jeos.tdl b/heat/jeos/U10-amd64-cfntools-jeos.tdl
index 0440e36508..5ea4db184b 100644
--- a/heat/jeos/U10-amd64-cfntools-jeos.tdl
+++ b/heat/jeos/U10-amd64-cfntools-jeos.tdl
@@ -11,7 +11,7 @@
   <description>Ubuntu 10.04</description>
   <commands>
     <command name='commands'>
-apt-get -y upgrade;apt-get -y install cloud-init;/usr/sbin/useradd ec2-user;echo -e 'ec2-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers;chmod +x /opt/aws/bin/cfn-*
+apt-get -y upgrade;apt-get -y install cloud-init;/usr/sbin/useradd -m ec2-user;echo -e 'ec2-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers;chmod +x /opt/aws/bin/cfn-*
     </command>
   </commands>
   <files>