From ac161dbccc7f0d522735552f18115801fcf331d1 Mon Sep 17 00:00:00 2001 From: Stephan Renatus Date: Sun, 26 May 2013 14:42:57 +0200 Subject: [PATCH 1/3] Update centos-6-openstack.ks a couple of small fixes: - enable console-logging in the way Nova expects (i.e. make `nova console-log $VM` work; see [here](https://ask.openstack.org/question/108/configuring-image-to-write-to-console-log/) for more information) - add `ec2-user` for `cloud-init` (the user that gets the SSH key injected in the default config) - add `NOZEROCONF` variable that prevents CentOS from adding a 169.254.0.0-route that troubles fetching metadata (at least with Quantum, but Zeroconf's probably not needed in a cloud VM anyways) --- centos-6-openstack.ks | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/centos-6-openstack.ks b/centos-6-openstack.ks index 5967b10..c2e030b 100644 --- a/centos-6-openstack.ks +++ b/centos-6-openstack.ks @@ -24,13 +24,17 @@ reboot @Core cloud-init %end -%post --log=/root/post.log --nochroot -sed -i "s/^ACTIVE_CONSOLES=\/dev\/tty\[1-6\]/ACTIVE_CONSOLES=\/dev\/tty1/" /mnt/sysimage/etc/sysconfig/init -sed -i "/HWADDR/d" /mnt/sysimage/etc/sysconfig/network-scripts/ifcfg-eth* -rm -f /mnt/sysimage/etc/udev/rules.d/70-persistent-net.rules +%post --log=/root/post.log +echo "NOZEROCONF=yes" >> /etc/sysconfig/network +echo "S0:2345:respawn:/sbin/agetty ttyS0 115200 linux" >> /etc/inittab +sed -i "s/^ACTIVE_CONSOLES=\/dev\/tty\[1-6\]/ACTIVE_CONSOLES=\/dev\/tty1/" /etc/sysconfig/init +sed -i "/HWADDR/d" /etc/sysconfig/network-scripts/ifcfg-eth* +rm -f /etc/udev/rules.d/70-persistent-net.rules for f in /etc/grub.conf /boot/grub/menu.lst /boot/grub/grub.conf; do - /bin/sed -i "s/^serial.*$//" /mnt/sysimage/${f} - /bin/sed -i "s/^terminal.*$//" /mnt/sysimage/${f} - /bin/sed -i "s/console=ttyS0,115200//" /mnt/sysimage/${f} + sed -i "s/^serial.*$/serial –unit=0 –speed=115200/" ${f} + sed -i "s/^terminal.*$/terminal –timeout=10 console serial/" ${f} + sed -i "s/console=ttyS0,115200/console=tty0 console=ttyS0,115200n8/" ${f} done +useradd ec2-user +echo -e 'ec2-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers %end From 7e2963aeb596f07b76963505ee0eb977f14b95e5 Mon Sep 17 00:00:00 2001 From: Stephan Renatus Date: Sun, 26 May 2013 16:05:01 +0300 Subject: [PATCH 2/3] leave user creation to kickstart --- centos-6-openstack.ks | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/centos-6-openstack.ks b/centos-6-openstack.ks index c2e030b..9d00a73 100644 --- a/centos-6-openstack.ks +++ b/centos-6-openstack.ks @@ -19,6 +19,7 @@ volgroup VolGroup00 --pesize=32768 pv.2 logvol / --fstype ext4 --name=LogVol00 --vgname=VolGroup00 --size=1024 --grow logvol swap --fstype swap --name=LogVol01 --vgname=VolGroup00 --size=256 --grow --maxsize=512 reboot +user --name="ec2-user" %packages @Base @Core @@ -35,6 +36,5 @@ for f in /etc/grub.conf /boot/grub/menu.lst /boot/grub/grub.conf; do sed -i "s/^terminal.*$/terminal –timeout=10 console serial/" ${f} sed -i "s/console=ttyS0,115200/console=tty0 console=ttyS0,115200n8/" ${f} done -useradd ec2-user echo -e 'ec2-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers %end From 500261fbed791c630531f0d509db3a0ec0c681e8 Mon Sep 17 00:00:00 2001 From: Stephan Renatus Date: Thu, 6 Jun 2013 17:20:28 +0200 Subject: [PATCH 3/3] make cloud-init update /etc/hosts by default --- centos-6-openstack.ks | 1 + 1 file changed, 1 insertion(+) diff --git a/centos-6-openstack.ks b/centos-6-openstack.ks index 9d00a73..edf5b5a 100644 --- a/centos-6-openstack.ks +++ b/centos-6-openstack.ks @@ -27,6 +27,7 @@ cloud-init %end %post --log=/root/post.log echo "NOZEROCONF=yes" >> /etc/sysconfig/network +sed -i 's/set_hostname/set_hostname\n - update_etc_hosts/' /etc/cloud/cloud.cfg echo "S0:2345:respawn:/sbin/agetty ttyS0 115200 linux" >> /etc/inittab sed -i "s/^ACTIVE_CONSOLES=\/dev\/tty\[1-6\]/ACTIVE_CONSOLES=\/dev\/tty1/" /etc/sysconfig/init sed -i "/HWADDR/d" /etc/sysconfig/network-scripts/ifcfg-eth*