centos7-1503.diff

diff --git a/templates/CentOS-7.0-1406-x86_64-netinstall/base.sh b/templates/CentOS-7.0-1406-x86_64-netinstall/base.sh
deleted file mode 100644
index adf25d4..0000000
--- a/templates/CentOS-7.0-1406-x86_64-netinstall/base.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-# 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/beta/7/\$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 dkms nfs-utils bzip2
-
-# Make ssh faster by not waiting on DNS
-echo "UseDNS no" >> /etc/ssh/sshd_config
diff --git a/templates/CentOS-7.0-1406-x86_64-netinstall/chef.sh b/templates/CentOS-7.0-1406-x86_64-netinstall/chef.sh
deleted file mode 100644
index cf2ddee..0000000
--- a/templates/CentOS-7.0-1406-x86_64-netinstall/chef.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-# Install Chef
-curl -L https://www.opscode.com/chef/install.sh | bash
diff --git a/templates/CentOS-7.0-1406-x86_64-netinstall/cleanup.sh b/templates/CentOS-7.0-1406-x86_64-netinstall/cleanup.sh
deleted file mode 100644
index 7160af7..0000000
--- a/templates/CentOS-7.0-1406-x86_64-netinstall/cleanup.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-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
-
-# Remove traces of mac address from network configuration
-sed -i /HWADDR/d /etc/sysconfig/network-scripts/ifcfg-enp0s3
diff --git a/templates/CentOS-7.0-1406-x86_64-netinstall/definition.rb b/templates/CentOS-7.0-1406-x86_64-netinstall/definition.rb
deleted file mode 100644
index 68ec95b..0000000
--- a/templates/CentOS-7.0-1406-x86_64-netinstall/definition.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-Veewee::Session.declare({
-  :cpu_count => '1',
-  :memory_size=> '480',
-  :disk_size => '10140',
-  :disk_format => 'VDI',
-  :hostiocache => 'off',
-  :os_type_id => 'RedHat6_64',
-  :iso_file => "CentOS-7.0-1406-x86_64-NetInstall.iso",
-  :iso_src => "http://mirror.nextlayer.at/centos/7.0.1406/isos/x86_64/CentOS-7.0-1406-x86_64-NetInstall.iso",
-  :iso_md5 => "96de4f38a2f07da51831153549c8bd0c",
-  :iso_download_timeout => 1000,
-  :boot_wait => "10",
-  :boot_cmd_sequence => [
-    '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>'
-  ],
-  :kickstart_port => "7122",
-  :kickstart_timeout => 300,
-  :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 => [
-    "base.sh",
-    "chef.sh",
-    "puppet.sh",
-    "vagrant.sh",
-    "virtualbox.sh",
-    #"vmfusion.sh",
-    "cleanup.sh",
-    "zerodisk.sh"
-  ],
-  :postinstall_timeout => 10000
-})
diff --git a/templates/CentOS-7.0-1406-x86_64-netinstall/ks.cfg b/templates/CentOS-7.0-1406-x86_64-netinstall/ks.cfg
deleted file mode 100644
index 3b0b0c8..0000000
--- a/templates/CentOS-7.0-1406-x86_64-netinstall/ks.cfg
+++ /dev/null
@@ -1,39 +0,0 @@
-install
-url --url=http://mirror.nextlayer.at/centos/7.0.1406/os/x86_64/
-lang en_US.UTF-8
-keyboard us
-network --bootproto=dhcp
-rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/
-firewall --enabled --service=ssh
-authconfig --enableshadow --passalgo=sha512
-selinux --disabled
-timezone UTC
-bootloader --location=mbr
-
-text
-skipx
-zerombr
-
-clearpart --all --initlabel
-autopart
-
-auth  --useshadow  --enablemd5
-firstboot --disabled
-reboot
-
-%packages --nobase
-@core
-bzip2
-openssh-clients
-openssh-server
-%end
-
-%post
-/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
-
diff --git a/templates/CentOS-7.0-1406-x86_64-netinstall/puppet.sh b/templates/CentOS-7.0-1406-x86_64-netinstall/puppet.sh
deleted file mode 100644
index 6e4fa20..0000000
--- a/templates/CentOS-7.0-1406-x86_64-netinstall/puppet.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-# Install Puppet
-
-cat > /etc/yum.repos.d/puppetlabs.repo << EOM
-[puppetlabs-dependencies]
-name=puppetlabdsdependencies
-baseurl=http://yum.puppetlabs.com/el/7/dependencies/\$basearch
-enabled=1
-gpgcheck=0
-
-[puppetlabs]
-name=puppetlabs
-baseurl=http://yum.puppetlabs.com/el/7/products/\$basearch
-enabled=1
-gpgcheck=0
-EOM
-
-yum -y install puppet facter ruby-shadow
-
diff --git a/templates/CentOS-7.0-1406-x86_64-netinstall/vagrant.sh b/templates/CentOS-7.0-1406-x86_64-netinstall/vagrant.sh
deleted file mode 100644
index 2cfe29f..0000000
--- a/templates/CentOS-7.0-1406-x86_64-netinstall/vagrant.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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
diff --git a/templates/CentOS-7.0-1406-x86_64-netinstall/virtualbox.sh b/templates/CentOS-7.0-1406-x86_64-netinstall/virtualbox.sh
deleted file mode 100644
index 46658dc..0000000
--- a/templates/CentOS-7.0-1406-x86_64-netinstall/virtualbox.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-# 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
-
diff --git a/templates/CentOS-7.0-1406-x86_64-netinstall/vmfusion.sh b/templates/CentOS-7.0-1406-x86_64-netinstall/vmfusion.sh
deleted file mode 100644
index 3bd2e1b..0000000
--- a/templates/CentOS-7.0-1406-x86_64-netinstall/vmfusion.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-# vmware-vmblock-fuse requires libfuse.so
-yum -y install fuse-libs
-
-cd /tmp
-mkdir -p /mnt/cdrom
-mount -o loop /home/veewee/linux.iso /mnt/cdrom
-tar zxf /mnt/cdrom/VMwareTools-*.tar.gz -C /tmp/
-/tmp/vmware-tools-distrib/vmware-install.pl -d
-umount /mnt/cdrom
-rm /home/veewee/linux.iso
diff --git a/templates/CentOS-7.0-1406-x86_64-netinstall/zerodisk.sh b/templates/CentOS-7.0-1406-x86_64-netinstall/zerodisk.sh
deleted file mode 100644
index 938075a..0000000
--- a/templates/CentOS-7.0-1406-x86_64-netinstall/zerodisk.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# Zero out the free space to save space in the final image:
-dd if=/dev/zero of=/EMPTY bs=1M
-rm -f /EMPTY
diff --git a/templates/CentOS-7.0-1503-x86_64-netinstall/base.sh b/templates/CentOS-7.0-1503-x86_64-netinstall/base.sh
new file mode 100644
index 0000000..adf25d4
--- /dev/null
+++ b/templates/CentOS-7.0-1503-x86_64-netinstall/base.sh
@@ -0,0 +1,16 @@
+# 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/beta/7/\$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 dkms nfs-utils bzip2
+
+# Make ssh faster by not waiting on DNS
+echo "UseDNS no" >> /etc/ssh/sshd_config
diff --git a/templates/CentOS-7.0-1503-x86_64-netinstall/chef.sh b/templates/CentOS-7.0-1503-x86_64-netinstall/chef.sh
new file mode 100644
index 0000000..cf2ddee
--- /dev/null
+++ b/templates/CentOS-7.0-1503-x86_64-netinstall/chef.sh
@@ -0,0 +1,2 @@
+# Install Chef
+curl -L https://www.opscode.com/chef/install.sh | bash
diff --git a/templates/CentOS-7.0-1503-x86_64-netinstall/cleanup.sh b/templates/CentOS-7.0-1503-x86_64-netinstall/cleanup.sh
new file mode 100644
index 0000000..7160af7
--- /dev/null
+++ b/templates/CentOS-7.0-1503-x86_64-netinstall/cleanup.sh
@@ -0,0 +1,7 @@
+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
+
+# Remove traces of mac address from network configuration
+sed -i /HWADDR/d /etc/sysconfig/network-scripts/ifcfg-enp0s3
diff --git a/templates/CentOS-7.0-1503-x86_64-netinstall/definition.rb b/templates/CentOS-7.0-1503-x86_64-netinstall/definition.rb
new file mode 100644
index 0000000..1ec38a2
--- /dev/null
+++ b/templates/CentOS-7.0-1503-x86_64-netinstall/definition.rb
@@ -0,0 +1,38 @@
+Veewee::Session.declare({
+  :cpu_count => '1',
+  :memory_size=> '480',
+  :disk_size => '10140',
+  :disk_format => 'VDI',
+  :hostiocache => 'off',
+  :os_type_id => 'RedHat6_64',
+  :iso_file => "CentOS-7-x86_64-NetInstall-1503.iso",
+  :iso_src => "http://mirror.nextlayer.at/centos/7/isos/x86_64/CentOS-7-x86_64-NetInstall-1503.iso",
+  :iso_md5 => "111379a06402e1e445c6aeee9401d031",
+  :iso_download_timeout => 1000,
+  :boot_wait => "10",
+  :boot_cmd_sequence => [
+    '<Tab> text ks=http://%IP%:%PORT%/ks.cfg<Enter>'
+  ],
+  :kickstart_port => "7122",
+  :kickstart_timeout => 300,
+  :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 => [
+    "base.sh",
+    "chef.sh",
+    "puppet.sh",
+    "vagrant.sh",
+    "virtualbox.sh",
+    #"vmfusion.sh",
+    "cleanup.sh",
+    "zerodisk.sh"
+  ],
+  :postinstall_timeout => 10000
+})
diff --git a/templates/CentOS-7.0-1503-x86_64-netinstall/ks.cfg b/templates/CentOS-7.0-1503-x86_64-netinstall/ks.cfg
new file mode 100644
index 0000000..05a20db
--- /dev/null
+++ b/templates/CentOS-7.0-1503-x86_64-netinstall/ks.cfg
@@ -0,0 +1,39 @@
+install
+url --url=http://mirror.nextlayer.at/centos/7/os/x86_64/
+lang en_US.UTF-8
+keyboard us
+network --bootproto=dhcp
+rootpw --iscrypted $1$damlkd,f$UC/u5pUts5QiU3ow.CSso/
+firewall --enabled --service=ssh
+authconfig --enableshadow --passalgo=sha512
+selinux --disabled
+timezone UTC
+bootloader --location=mbr
+
+text
+skipx
+zerombr
+
+clearpart --all --initlabel
+autopart
+
+auth  --useshadow  --enablemd5
+firstboot --disabled
+reboot
+
+%packages --nobase
+@core
+bzip2
+openssh-clients
+openssh-server
+%end
+
+%post
+/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
+
diff --git a/templates/CentOS-7.0-1503-x86_64-netinstall/puppet.sh b/templates/CentOS-7.0-1503-x86_64-netinstall/puppet.sh
new file mode 100644
index 0000000..6e4fa20
--- /dev/null
+++ b/templates/CentOS-7.0-1503-x86_64-netinstall/puppet.sh
@@ -0,0 +1,18 @@
+# Install Puppet
+
+cat > /etc/yum.repos.d/puppetlabs.repo << EOM
+[puppetlabs-dependencies]
+name=puppetlabdsdependencies
+baseurl=http://yum.puppetlabs.com/el/7/dependencies/\$basearch
+enabled=1
+gpgcheck=0
+
+[puppetlabs]
+name=puppetlabs
+baseurl=http://yum.puppetlabs.com/el/7/products/\$basearch
+enabled=1
+gpgcheck=0
+EOM
+
+yum -y install puppet facter ruby-shadow
+
diff --git a/templates/CentOS-7.0-1503-x86_64-netinstall/vagrant.sh b/templates/CentOS-7.0-1503-x86_64-netinstall/vagrant.sh
new file mode 100644
index 0000000..2cfe29f
--- /dev/null
+++ b/templates/CentOS-7.0-1503-x86_64-netinstall/vagrant.sh
@@ -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
diff --git a/templates/CentOS-7.0-1503-x86_64-netinstall/virtualbox.sh b/templates/CentOS-7.0-1503-x86_64-netinstall/virtualbox.sh
new file mode 100644
index 0000000..46658dc
--- /dev/null
+++ b/templates/CentOS-7.0-1503-x86_64-netinstall/virtualbox.sh
@@ -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
+
diff --git a/templates/CentOS-7.0-1503-x86_64-netinstall/vmfusion.sh b/templates/CentOS-7.0-1503-x86_64-netinstall/vmfusion.sh
new file mode 100644
index 0000000..3bd2e1b
--- /dev/null
+++ b/templates/CentOS-7.0-1503-x86_64-netinstall/vmfusion.sh
@@ -0,0 +1,10 @@
+# vmware-vmblock-fuse requires libfuse.so
+yum -y install fuse-libs
+
+cd /tmp
+mkdir -p /mnt/cdrom
+mount -o loop /home/veewee/linux.iso /mnt/cdrom
+tar zxf /mnt/cdrom/VMwareTools-*.tar.gz -C /tmp/
+/tmp/vmware-tools-distrib/vmware-install.pl -d
+umount /mnt/cdrom
+rm /home/veewee/linux.iso
diff --git a/templates/CentOS-7.0-1503-x86_64-netinstall/zerodisk.sh b/templates/CentOS-7.0-1503-x86_64-netinstall/zerodisk.sh
new file mode 100644
index 0000000..938075a
--- /dev/null
+++ b/templates/CentOS-7.0-1503-x86_64-netinstall/zerodisk.sh
@@ -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