[cloud-init/f16] Disable SSH key-deleting on startup

[gholms]

commit 87f33190f43d2b26cced4597e7298835024466c2
Author: Garrett Holmstrom <gholms at fedoraproject.org>
Date:   Wed Oct 5 11:31:19 2011 -0700

    Disable SSH key-deleting on startup

 cloud-init-0.6.2-sshsvc.patch |    2 +-
 cloud-init-fedora.cfg         |    5 +++--
 cloud-init.spec               |    5 ++++-
 3 files changed, 8 insertions(+), 4 deletions(-)
---
diff --git a/cloud-init-0.6.2-sshsvc.patch b/cloud-init-0.6.2-sshsvc.patch
index 3403445..27ae837 100644
--- a/cloud-init-0.6.2-sshsvc.patch
+++ b/cloud-init-0.6.2-sshsvc.patch
@@ -22,7 +22,7 @@ Index: cloud-init-fedora/cloudinit/CloudConfig/cc_ssh.py
 -    for f in glob.glob("/etc/ssh/ssh_host_*key*"):
 -        try: os.unlink(f)
 -        except: pass
-+    if cfg.get("delete_system_ssh_keys", True):
++    if cfg.get("ssh_deletekeys", True):
 +        for f in glob.glob("/etc/ssh/ssh_host_*key*"):
 +            try: os.unlink(f)
 +            except: pass
diff --git a/cloud-init-fedora.cfg b/cloud-init-fedora.cfg
index 2e7cc9b..b9dc2a9 100644
--- a/cloud-init-fedora.cfg
+++ b/cloud-init-fedora.cfg
@@ -3,11 +3,12 @@ disable_root: 1
 ssh_pwauth:   0
 
 cc_ready_cmd: ['/bin/true']
+locale_configfile: /etc/sysconfig/i18n
 mount_default_fields: [~, ~, 'auto', 'defaults,nofail', '0', '2']
+ssh_deletekeys:   0
 ssh_genkeytypes:  ~
-ssh_svcname: sshd
+ssh_svcname:      sshd
 syslog_fix_perms: ~
-locale_configfile: /etc/sysconfig/i18n
 
 cloud_init_modules:
  - bootcmd
diff --git a/cloud-init.spec b/cloud-init.spec
index 8152804..2391bd1 100644
--- a/cloud-init.spec
+++ b/cloud-init.spec
@@ -2,7 +2,7 @@
 
 Name:           cloud-init
 Version:        0.6.2
-Release:        0.6.bzr457%{?dist}
+Release:        0.7.bzr457%{?dist}
 Summary:        Cloud instance init scripts
 
 Group:          System Environment/Base
@@ -155,6 +155,9 @@ fi
 
 
 %changelog
+* Wed Oct  5 2011 Garrett Holmstrom <gholms at fedoraproject.org> - 0.6.2-0.7.bzr457
+- Disabled SSH key-deleting on startup
+
 * Wed Sep 28 2011 Garrett Holmstrom <gholms at fedoraproject.org> - 0.6.2-0.6.bzr457
 - Consolidated selinux file context patches
 - Fixed cloud-init.service dependencies