CLOUDSTACK-1066: restore modularity in config files by splitting postinstall tasks

Add config.dat to ensure that openswan install does not hang asking for user input

tools/appliance/definitions/systemvmtemplate/base.sh

@@ -0,0 +1,27 @@
+# Update the box
+apt-get -y update
+#below are needed for ruby perhaps
+apt-get -y install linux-headers-$(uname -r) build-essential
+apt-get -y install zlib1g-dev libssl-dev libreadline-gplv2-dev
+apt-get -y install curl unzip
+apt-get clean
+
+# Set up sudo
+echo 'vagrant ALL=NOPASSWD:ALL' > /etc/sudoers.d/vagrant
+
+# Tweak sshd to prevent DNS resolution (speed up logins)
+echo 'UseDNS no' >> /etc/ssh/sshd_config
+
+# Remove 5s grub timeout to speed up booting
+echo <<EOF > /etc/default/grub
+# If you change this file, run 'update-grub' afterwards to update
+# /boot/grub/grub.cfg.
+
+GRUB_DEFAULT=0
+GRUB_TIMEOUT=0
+GRUB_DISTRIBUTOR=`lsb_release -i -s 2> /dev/null || echo Debian`
+GRUB_CMDLINE_LINUX_DEFAULT="quiet"
+GRUB_CMDLINE_LINUX="debian-installer=en_US"
+EOF
+
+update-grub

tools/appliance/definitions/systemvmtemplate/cleanup.sh

@@ -0,0 +1,17 @@
+# Clean up
+apt-get -y remove linux-headers-$(uname -r) build-essential
+apt-get -y autoremove
+
+# Removing leftover leases and persistent rules
+echo "cleaning up dhcp leases"
+rm /var/lib/dhcp/*
+
+# Make sure Udev doesn't block our network
+echo "cleaning up udev rules"
+rm /etc/udev/rules.d/70-persistent-net.rules
+mkdir /etc/udev/rules.d/70-persistent-net.rules
+rm -rf /dev/.udev/
+rm /lib/udev/rules.d/75-persistent-net-generator.rules
+
+echo "Adding a 2 sec delay to the interface up, to make the dhclient happy"
+echo "pre-up sleep 2" >> /etc/network/interfaces

tools/appliance/definitions/systemvmtemplate/cloudstack-packages.sh

@@ -0,0 +1,86 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+
+ROOTPW=password
+CLOUDSTACK_RELEASE=4.2.0
+
+
+install_packages() {
+  DEBIAN_FRONTEND=noninteractive
+  DEBIAN_PRIORITY=critical
+
+  #basic stuff
+   apt-get --no-install-recommends -q -y --force-yes install rsyslog logrotate cron chkconfig insserv net-tools ifupdown vim-tiny netbase iptables openssh-server grub-legacy e2fsprogs dhcp3-client dnsmasq tcpdump socat wget  python bzip2 sed gawk diff grep gzip less tar telnet ftp rsync traceroute psmisc lsof procps monit inetutils-ping iputils-arping httping dnsutils zip unzip ethtool uuid file iproute acpid iptables-persistent virt-what sudo
+
+  #sysstat
+  echo 'sysstat sysstat/enable boolean true' | debconf-set-selections
+  apt-get --no-install-recommends -q -y --force-yes install sysstat
+  #apache
+  apt-get --no-install-recommends -q -y --force-yes install apache2 ssl-cert
+  #haproxy
+  apt-get --no-install-recommends -q -y --force-yes install haproxy
+  #dnsmasq
+  apt-get --no-install-recommends -q -y --force-yes install dnsmasq
+  #nfs client
+  apt-get --no-install-recommends -q -y --force-yes install nfs-common
+  #vpn stuff
+  apt-get --no-install-recommends -q -y --force-yes install xl2tpd openswan bcrelay ppp ipsec-tools tdb-tools
+  #vmware tools
+  apt-get --no-install-recommends -q -y --force-yes install open-vm-tools
+  #xenstore utils
+  apt-get --no-install-recommends -q -y --force-yes install xenstore-utils libxenstore3.0
+  #keepalived and conntrackd
+  apt-get --no-install-recommends -q -y --force-yes install keepalived conntrackd ipvsadm libnetfilter-conntrack3 libnl1
+  #ipcalc
+  apt-get --no-install-recommends -q -y --force-yes install ipcalc
+  #java
+  apt-get --no-install-recommends -q -y --force-yes install  default-jre-headless
+
+}
+
+accounts() {
+  # Setup sudo to allow no-password sudo for "admin"
+  groupadd -r admin
+  #create a 'cloud' user
+  usermod -a -G admin cloud
+  echo "root:password" | chpasswd
+  echo "cloud:password" | chpasswd
+  sed -i -e '/Defaults\s\+env_reset/a Defaults\texempt_group=admin' /etc/sudoers
+  sed -i -e 's/%admin ALL=(ALL) ALL/%admin ALL=NOPASSWD:ALL/g' /etc/sudoers
+  
+  mkdir -p /home/cloud/.ssh
+  chmod 700 /home/cloud/.ssh
+
+}
+
+do_fixes() {
+  #fix hostname in openssh-server generated keys
+  sed -i "s/root@\(.*\)$/root@systemvm/g" etc/ssh/ssh_host_*.pub
+}
+
+signature() {
+  touch /var/cache/cloud/cloud-scripts-signature
+  echo "Cloudstack Release $CLOUDSTACK_RELEASE $(date)" > /etc/cloudstack-release
+}
+
+echo "*************INSTALLING PACKAGES********************"
+install_packages
+echo "*************DONE INSTALLING PACKAGES********************"
+accounts
+do_fixes
+signature

tools/appliance/definitions/systemvmtemplate/definition.rb

@@ -38,6 +38,7 @@ Veewee::Definition.declare({
      'debconf/frontend=noninteractive ',
      'console-setup/ask_detect=false ',
      'console-keymaps-at/keymap=us ',
+     'keyboard-configuration/xkb-keymap=us ',
      '<Enter>'
   ],
   :kickstart_port => "7122",
@@ -45,14 +46,17 @@ Veewee::Definition.declare({
   :kickstart_file => "preseed.cfg",
   :ssh_login_timeout => "10000",
   :ssh_user => "root",
-  :ssh_password => "password",
+  :ssh_password => "vagrant",
   :ssh_key => "",
   :ssh_host_port => "7222",
   :ssh_guest_port => "22",
   :sudo_cmd => "echo '%p'|sudo -S sh '%f'",
   :shutdown_cmd => "halt -p",
   :postinstall_files => [
-    "postinstall.sh",
+    "base.sh",
+    "cloudstack-packages.sh",
+    "cleanup.sh",
+    "zerodisk.sh"
   ],
-  :postinstall_timeout => "10000"
+  :postinstall_timeout => "100000"
 })

tools/appliance/definitions/systemvmtemplate/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