Permalink
Browse files

Updated CentOS-6.0-x86_64-netboot for consistency

  • Loading branch information...
1 parent 91e0d58 commit 7a5f74df73db076b23f9da2b38d5b5cd587cde24 @miketheman miketheman committed Aug 11, 2012
@@ -0,0 +1,14 @@
+# Base install
+
+sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
+
+cat > /etc/yum.repos.d/epel.repo << EOM
+[epel]
+name=epel
+baseurl=http://download.fedoraproject.org/pub/epel/6/\$basearch
+enabled=1
+gpgcheck=0
+EOM
+
+yum -y install gcc make gcc-c++ kernel-devel-`uname -r` zlib-devel openssl-devel readline-devel sqlite-devel perl wget
+
@@ -0,0 +1,3 @@
+# Install Chef
+gem install --no-ri --no-rdoc chef
+
@@ -0,0 +1,5 @@
+yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
+yum -y clean all
+rm -rf /etc/yum.repos.d/{puppetlabs,epel}.repo
+rm -rf VBoxGuestAdditions_*.iso
+
@@ -1,16 +1,40 @@
-Veewee::Definition.declare({
- :cpu_count => '1', :memory_size=> '392',
- :disk_size => '10140', :disk_format => 'VDI', :hostiocache => 'off', :ioapic => 'on', :pae => 'on',
+Veewee::Session.declare({
+ :cpu_count => '1',
+ :memory_size=> '480',
+ :disk_size => '10140',
+ :disk_format => 'VDI',
+ :hostiocache => 'off',
:os_type_id => 'RedHat_64',
:iso_file => "CentOS-6.0-x86_64-netinstall.iso",
:iso_src => "http://vault.centos.org/6.0/isos/x86_64/CentOS-6.0-x86_64-netinstall.iso",
:iso_md5 => "d13da95c29e585ee15cf403b89468243",
:iso_download_timeout => 1000,
- :boot_wait => "15", :boot_cmd_sequence => [ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>' ],
- :kickstart_port => "7122", :kickstart_timeout => 10000, :kickstart_file => "ks.cfg",
- :ssh_login_timeout => "10000", :ssh_user => "vagrant", :ssh_password => "vagrant", :ssh_key => "",
- :ssh_host_port => "7222", :ssh_guest_port => "22",
+ :boot_wait => "15",
+ :boot_cmd_sequence => [
+ '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>'
+ ],
+ :kickstart_port => "7122",
+ :kickstart_timeout => 10000,
+ :kickstart_file => "ks.cfg",
+ :ssh_login_timeout => "10000",
+ :ssh_user => "veewee",
+ :ssh_password => "veewee",
+ :ssh_key => "",
+ :ssh_host_port => "7222",
+ :ssh_guest_port => "22",
:sudo_cmd => "echo '%p'|sudo -S sh '%f'",
:shutdown_cmd => "/sbin/halt -h -p",
- :postinstall_files => [ "postinstall.sh"], :postinstall_timeout => 10000
+ :postinstall_files => [
+ "base.sh",
+ "ruby.sh",
+ "chef.sh",
+ "puppet.sh",
+ "vagrant.sh",
+ "virtualbox.sh",
+ #"kvm.sh",
+ #"vmfusion.sh",
+ "cleanup.sh",
+ "zerodisk.sh"
+ ],
+ :postinstall_timeout => 10000
})
@@ -1,13 +1,13 @@
install
-url --url=http://be.mirror.eurid.eu/centos/6.0/os/x86_64/
+url --url=http://vault.centos.org/6.0/os/x86_64/
lang en_US.UTF-8
keyboard us
-network --bootproto dhcp
+network --bootproto=dhcp
rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/
-firewall --enabled --trust eth0 --ssh
-authconfig --enableshadow --enablemd5
+firewall --enabled --service=ssh
+authconfig --enableshadow --passalgo=sha512
selinux --disabled
-timezone Europe/Brussels
+timezone UTC
bootloader --location=mbr
text
@@ -17,38 +17,26 @@ zerombr
clearpart --all --initlabel
autopart
-auth --useshadow --enablemd5
+auth --useshadow --enablemd5
firstboot --disabled
reboot
-repo --name=epel --baseurl=http://download.fedoraproject.org/pub/epel/6/x86_64/ --includepkgs='ruby-augeas,ruby-shadow'
-repo --name=puppetlabs --baseurl=http://yum.puppetlabs.com/el/6/products/x86_64 --includepkgs='puppet,facter'
-
-%packages
-@ core
-ruby
-ruby-devel
-rubygems
-kernel-devel
-gcc
-gcc-c++
+%packages --ignoremissing
+@core
bzip2
-make
-zlib-devel
-openssl-devel
-readline-devel
-sqlite-devel
-puppet
-facter
-
+kernel-devel
+kernel-headers
-ipw2100-firmware
-ipw2200-firmware
-ivtv-firmware
+%end
%post
-/usr/sbin/groupadd vagrant
-/usr/sbin/useradd vagrant -g vagrant -G wheel
-echo "vagrant"|passwd --stdin vagrant
-echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant
-chmod 0440 /etc/sudoers.d/vagrant
+/usr/bin/yum -y install sudo
+/usr/sbin/groupadd veewee
+/usr/sbin/useradd veewee -g veewee -G wheel
+echo "veewee"|passwd --stdin veewee
+echo "veewee ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/veewee
+chmod 0440 /etc/sudoers.d/veewee
+%end
@@ -1,30 +0,0 @@
-#http://chrisadams.me.uk/2010/05/10/setting-up-a-centos-base-box-for-development-and-testing-with-vagrant/
-
-date > /etc/vagrant_box_build_time
-
-yum -y erase gtk2 libX11 hicolor-icon-theme avahi freetype bitstream-vera-fonts
-yum -y clean all
-
-gem install --no-ri --no-rdoc chef
-
-# Installing vagrant keys
-mkdir /home/vagrant/.ssh
-chmod 700 /home/vagrant/.ssh
-cd /home/vagrant/.ssh
-wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O authorized_keys
-chown -R vagrant /home/vagrant/.ssh
-
-# Installing the virtualbox guest additions
-VBOX_VERSION=$(cat /home/vagrant/.vbox_version)
-cd /tmp
-wget http://download.virtualbox.org/virtualbox/$VBOX_VERSION/VBoxGuestAdditions_$VBOX_VERSION.iso
-mount -o loop VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
-sh /mnt/VBoxLinuxAdditions.run
-umount /mnt
-rm VBoxGuestAdditions_$VBOX_VERSION.iso
-
-sed -i "s/^.*requiretty/#Defaults requiretty/" /etc/sudoers
-
-dd if=/dev/zero of=/tmp/clean || rm /tmp/clean
-
-exit
@@ -0,0 +1,12 @@
+# Install Puppet
+
+cat > /etc/yum.repos.d/puppetlabs.repo << EOM
+[puppetlabs]
+name=puppetlabs
+baseurl=http://yum.puppetlabs.com/el/6/products/\$basearch
+enabled=1
+gpgcheck=0
+EOM
+
+yum -y install puppet facter
+
@@ -0,0 +1,3 @@
+# Install Ruby
+yum -y install ruby ruby-devel rubygems
+
@@ -0,0 +1,18 @@
+# Vagrant specific
+date > /etc/vagrant_box_build_time
+
+# Add vagrant user
+/usr/sbin/groupadd vagrant
+/usr/sbin/useradd vagrant -g vagrant -G wheel
+echo "vagrant"|passwd --stdin vagrant
+echo "vagrant ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers.d/vagrant
+chmod 0440 /etc/sudoers.d/vagrant
+
+# Installing vagrant keys
+mkdir -pm 700 /home/vagrant/.ssh
+wget --no-check-certificate 'https://raw.github.com/mitchellh/vagrant/master/keys/vagrant.pub' -O /home/vagrant/.ssh/authorized_keys
+chmod 0600 /home/vagrant/.ssh/authorized_keys
+chown -R vagrant /home/vagrant/.ssh
+
+# Customize the message of the day
+echo 'Welcome to your Vagrant-built virtual machine.' > /etc/motd
@@ -0,0 +1,8 @@
+# Installing the virtualbox guest additions
+VBOX_VERSION=$(cat /home/veewee/.vbox_version)
+cd /tmp
+mount -o loop /home/veewee/VBoxGuestAdditions_$VBOX_VERSION.iso /mnt
+sh /mnt/VBoxLinuxAdditions.run
+umount /mnt
+rm -rf /home/veewee/VBoxGuestAdditions_*.iso
+
@@ -0,0 +1,3 @@
+# Zero out the free space to save space in the final image:
+dd if=/dev/zero of=/EMPTY bs=1M
+rm -f /EMPTY

0 comments on commit 7a5f74d

Please sign in to comment.