From 017142703c53e7f3d0bc892f50832fd2841dc366 Mon Sep 17 00:00:00 2001
From: Karanbir Singh <kbsingh@karan.org>
Date: Jul 15 2014 11:49:23 +0000
Subject: make the default user be centos


---

diff --git a/SOURCES/cloud-init-centos.cfg b/SOURCES/cloud-init-centos.cfg
new file mode 100644
index 0000000..24c9fc8
--- /dev/null
+++ b/SOURCES/cloud-init-centos.cfg
@@ -0,0 +1,66 @@
+users:
+ - default
+
+disable_root: 1
+ssh_pwauth:   0
+
+locale_configfile: /etc/sysconfig/i18n
+mount_default_fields: [~, ~, 'auto', 'defaults,nofail', '0', '2']
+resize_rootfs_tmp: /dev
+ssh_deletekeys:   0
+ssh_genkeytypes:  ~
+syslog_fix_perms: ~
+
+cloud_init_modules:
+ - migrator
+ - bootcmd
+ - write-files
+ - growpart
+ - resizefs
+ - set_hostname
+ - update_hostname
+ - update_etc_hosts
+ - rsyslog
+ - users-groups
+ - ssh
+
+cloud_config_modules:
+ - mounts
+ - locale
+ - set-passwords
+ - yum-add-repo
+ - package-update-upgrade-install
+ - timezone
+ - puppet
+ - chef
+ - salt-minion
+ - mcollective
+ - disable-ec2-metadata
+ - runcmd
+
+cloud_final_modules:
+ - rightscale_userdata
+ - scripts-per-once
+ - scripts-per-boot
+ - scripts-per-instance
+ - scripts-user
+ - ssh-authkey-fingerprints
+ - keys-to-console
+ - phone-home
+ - final-message
+
+system_info:
+  default_user:
+    name: centos
+    lock_passwd: true
+    gecos: Cloud User
+    groups: [wheel, adm, systemd-journal]
+    sudo: ["ALL=(ALL) NOPASSWD:ALL"]
+    shell: /bin/bash
+  distro: rhel
+  paths:
+    cloud_dir: /var/lib/cloud
+    templates_dir: /etc/cloud/templates
+  ssh_svcname: sshd
+
+# vim:syntax=yaml
diff --git a/SOURCES/cloud-init-rhel.cfg b/SOURCES/cloud-init-rhel.cfg
deleted file mode 100644
index 622840d..0000000
--- a/SOURCES/cloud-init-rhel.cfg
+++ /dev/null
@@ -1,66 +0,0 @@
-users:
- - default
-
-disable_root: 1
-ssh_pwauth:   0
-
-locale_configfile: /etc/sysconfig/i18n
-mount_default_fields: [~, ~, 'auto', 'defaults,nofail', '0', '2']
-resize_rootfs_tmp: /dev
-ssh_deletekeys:   0
-ssh_genkeytypes:  ~
-syslog_fix_perms: ~
-
-cloud_init_modules:
- - migrator
- - bootcmd
- - write-files
- - growpart
- - resizefs
- - set_hostname
- - update_hostname
- - update_etc_hosts
- - rsyslog
- - users-groups
- - ssh
-
-cloud_config_modules:
- - mounts
- - locale
- - set-passwords
- - yum-add-repo
- - package-update-upgrade-install
- - timezone
- - puppet
- - chef
- - salt-minion
- - mcollective
- - disable-ec2-metadata
- - runcmd
-
-cloud_final_modules:
- - rightscale_userdata
- - scripts-per-once
- - scripts-per-boot
- - scripts-per-instance
- - scripts-user
- - ssh-authkey-fingerprints
- - keys-to-console
- - phone-home
- - final-message
-
-system_info:
-  default_user:
-    name: cloud-user
-    lock_passwd: true
-    gecos: Cloud User
-    groups: [wheel, adm, systemd-journal]
-    sudo: ["ALL=(ALL) NOPASSWD:ALL"]
-    shell: /bin/bash
-  distro: rhel
-  paths:
-    cloud_dir: /var/lib/cloud
-    templates_dir: /etc/cloud/templates
-  ssh_svcname: sshd
-
-# vim:syntax=yaml
diff --git a/SPECS/cloud-init.spec b/SPECS/cloud-init.spec
index a541015..3ea6c07 100644
--- a/SPECS/cloud-init.spec
+++ b/SPECS/cloud-init.spec
@@ -7,14 +7,14 @@
 
 Name:           cloud-init
 Version:        0.7.5
-Release:        1%{?dist}
+Release:        1%{?dist}.1
 Summary:        Cloud instance init scripts
 
 Group:          System Environment/Base
 License:        GPLv3
 URL:            http://launchpad.net/cloud-init
 Source0:        https://launchpad.net/cloud-init/trunk/%{version}/+download/%{name}-%{version}.tar.gz
-Source1:        cloud-init-rhel.cfg
+Source1:        cloud-init-centos.cfg
 Source2:        cloud-init-README.rhel
 Source3:        cloud-init-tmpfiles.conf
 
@@ -160,6 +160,9 @@ fi
 
 
 %changelog
+* Tue Jul 15 2014 Karanbir Singh <kbsingh@centos.org>
+- default to using centos as the login id
+
 * Mon Jun 23 2014 Lars Kellogg-Stedman <lars@redhat.com> 0.7.5-1 (redhat)
 - Rebased against upstream 0.7.5-6 in order to pull in GCE support.