From bf4ebef871062f7c31241af15337a94ea2dc2f83 Mon Sep 17 00:00:00 2001
From: Garrett Holmstrom <gholms@fedoraproject.org>
Date: Thu, 13 Dec 2012 13:32:28 -0800
Subject: [PATCH] Add default_user to cloud.cfg (this is required for ssh keys
 to work)

---
 cloud-init-fedora.cfg | 1 +
 cloud-init.spec       | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/cloud-init-fedora.cfg b/cloud-init-fedora.cfg
index 31b51c7..ee3ac32 100644
--- a/cloud-init-fedora.cfg
+++ b/cloud-init-fedora.cfg
@@ -46,6 +46,7 @@ cloud_final_modules:
  - final-message
 
 system_info:
+  default_user: ec2-user
   distro: fedora
   paths:
     cloud_dir: /var/lib/cloud
diff --git a/cloud-init.spec b/cloud-init.spec
index f6b4230..22a3642 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -2,7 +2,7 @@
 
 Name:           cloud-init
 Version:        0.7.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Cloud instance init scripts
 
 Group:          System Environment/Base
@@ -133,6 +133,9 @@ fi
 
 
 %changelog
+* Thu Dec 13 2012 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.1-2
+- Added default_user to cloud.cfg (this is required for ssh keys to work)
+
 * Wed Nov 21 2012 Garrett Holmstrom <gholms@fedoraproject.org> - 0.7.1-1
 - Rebased against version 0.7.1
 - Fixed broken sudoers file generation