generic/fedora-18-x86_64-cloud.ks | 68 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) New commits: commit 0944412c942864363e49b5bcf66a9faa2c5f3193 Author: Matthew Miller <mattdm@xxxxxxxxxx> Date: Sun Dec 16 13:50:53 2012 -0500 Work around cloud-init 0.7.1 config file change, in case 0.7.1-2 doesn't make the cut. (This can be pulled out later, if it does.) diff --git a/generic/fedora-18-x86_64-cloud.ks b/generic/fedora-18-x86_64-cloud.ks index 38ceed4..db04391 100644 --- a/generic/fedora-18-x86_64-cloud.ks +++ b/generic/fedora-18-x86_64-cloud.ks @@ -143,6 +143,74 @@ systemctl mask tmp.mount #disable_root: 0 #EOF +# Temporary kludge in case https://bugzilla.redhat.com/show_bug.cgi?id=887363 +# does not make F18 final release. +if [[ $( rpm -q --qf '%{v}-%{r}' cloud-init) == "0.7.1-1.fc18" ]]; then +echo "Detected older cloud-init; generating config file now." +cat <<EOF > /etc/cloud/cloud.cfg +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: + - bootcmd + - write-files + - resizefs + - set_hostname + - update_hostname + - update_etc_hosts + - rsyslog + - users-groups + - ssh + +cloud_config_modules: + - mounts + - locale + - set-passwords + - 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: ec2-user + lock_passwd: true + gecos: EC2 user + groups: [wheel, adm] + sudo: ["ALL=(ALL) NOPASSWD:ALL"] + shell: /bin/bash + distro: fedora + paths: + cloud_dir: /var/lib/cloud + templates_dir: /etc/cloud/templates + ssh_svcname: sshd +# vim:syntax=yaml +EOF +fi echo "Zeroing out empty space." _______________________________________________ cloud mailing list cloud@xxxxxxxxxxxxxxxxxxxxxxx https://admin.fedoraproject.org/mailman/listinfo/cloud