X-Git-Url: https://iankelling.org/git/?a=blobdiff_plain;f=fai-revm;h=880a91c5e0d10a3bcd6ffb8c96df36f5a9624fa8;hb=5ccaac3779f6bcf991e6ab0f7d545b37e3a4db63;hp=87cf1cf90a01d1486be19c3d147b5738673a05e6;hpb=4261ad7e021ec77e7198cf42c3576dad07f12a64;p=automated-distro-installer

diff --git a/fai-revm b/fai-revm
index 87cf1cf..880a91c 100755
--- a/fai-revm
+++ b/fai-revm
@@ -1,74 +1,170 @@
 #!/bin/bash -l
-set -x
+# Copyright (C) 2016 Ian Kelling
 
-# Assumes pxe config for dhcp has been setup.
-# Deploy fai configuration to faiserver,
-# then start a virtual machine to test the config.
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
 
-set -eE -o pipefail
-trap 'echo "$0:$LINENO:error: \"$BASH_COMMAND\" returned $?"' ERR
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
 
-redeploy=false
-if [[ $1 == -r ]]; then
-    redeploy=true
-fi
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
-disk_count=2
 
-script_dir=$(dirname $(readlink -f "$BASH_SOURCE"))
 
-if [[ $script_dir == /a/bin/* ]]; then
-    rm -rf /a/tmp/fai2
-    mkdir -p /a/tmp
-    cp -ar /a/bin/fai /a/tmp/fai2
-    exec /a/tmp/fai2/${BASH_SOURCE##*/} "$@"
-fi
+x="$(readlink -f "$BASH_SOURCE")"
+script_dir="${x%/*}"
+source "${script_dir}/bash-trace"
 
-cd $script_dir
+e() { echo "$*"; "$@"; }
+
+
+usage() {
+  cat <<EOF
+# Usage: ${0##*/} [OPTIONS]
+Setup fai or arch pxe (depending on $0 name)
+then start a virtual machine to test the config
+
+Note, sometimes shutting down the existing demohost vm
+fails. Just run again if that happens.
 
+-d         Don't do dhcp setup for when we aren't on Ian's home network.
+-n         Create new qcow2(s) for vm. Good for testing partitioning
+           script, to ensure a blank disk.
+-p         Use pxe instead of autodiscover iso with fai.
+-r         Do not boot after install is complete
+-h|--help  Print help and exit.
 
+Note: Uses GNU getopt options parsing style
+EOF
+  exit $1
+}
+
+orig_args=("$@")
 new_disk=false
-[[ ! $1 ]] || new_disk=true
+pxe=false
+temp=$(getopt -l help dnprh "$@") || usage 1
+eval set -- "$temp"
+while true; do
+  case $1 in
+    -d) dhcp_arg=-d; shift ;;
+    -n) new_disk=true; shift ;;
+    -p) pxe=true; shift ;;
+    -r) reboot_arg=--noreboot; shift ;;
+    -h|--help) usage ;;
+    --) shift; break ;;
+    *) echo "$0: Internal error!" ; exit 1 ;;
+  esac
+done
+
+
+# change this to test different disk counts. 1 and > 1 should be the only
+# important things to test.
+disk_count=1
+
+
+if [[ $script_dir == /a/bin/* ]]; then
+  # Copy our script elsewhere so we can develop it
+  # and save it at the same time it's running
+  rm -rf /tmp/faifreeze
+  cp -ar /a/bin/fai /tmp/faifreeze
+  exec /tmp/faifreeze/${BASH_SOURCE##*/} "${orig_args[@]}"
+fi
+
+cd $script_dir
 
-if [[ $0 == *arch-revm ]]; then
-    # via osinfo-query os. guessing arch is closest to latest fedora.
-    variant=fedora22
+is_arch_revm() {
+  [[ ${0##*/} == arch-revm ]]
+}
+
+cleanup() {
+  echo "doing cleanup"
+  e ./pxe-server $dhcp_arg
+  ./faiserver-disable
+}
+_errcatch_cleanup=cleanup
+
+boot_arg=--pxe
+if is_arch_revm; then
+  e ./pxe-server $dhcp_arg demohost arch
+  sleep 2
+  # via osinfo-query os. guessing arch is closest to latest fedora.
+  variant=fedora22
 else
-    if $redeploy; then
-        ./fai-redep
+  if $pxe; then
+    e ./pxe-server $dhcp_arg demohost fai
+    sleep 2
+  else
+    fai-monitor &
+    if [[ ! $BASEFILE_DIR ]]; then
+      BASEFILE_DIR=/tmp
+    fi
+    if [[ ! -e $BASEFILE_DIR/autodiscover.iso ]]; then
+      fai-cd -g $(readlink -f grub.cfg.autodiscover) -f -A $BASEFILE_DIR/autodiscover.iso
     fi
-    variant=debian8
+    boot_arg="--cdrom $BASEFILE_DIR/autodiscover.iso"
+    e fai-redep
+    e myfai-chboot default
+  fi
+  # I don't think these variants actually make a diff for us, but I
+  # use the appropriate one when trying a new distro just in case.
+  variant=ubuntu14.04
+  #variant=ubuntu16.04
+  #variant=debian8
 fi
 
 name=demohost
 
-s virshrm $name ||:
+e s virshrm $name ||:
 
 
 disk_arg=()
 for ((i=1; i <= disk_count; i++)); do
-    f=/var/lib/libvirt/images/${name}$i
-    disk_arg+=("--disk path=$f")
-    if $new_disk || [[ ! -e $f ]]; then
-        s rm -f $f
-        s qemu-img create -o preallocation=metadata -f qcow2 $f 20G
-    fi
+  f=/var/lib/libvirt/images/${name}$i
+  disk_arg+=("--disk path=$f")
+  if $new_disk || [[ ! -e $f ]]; then
+    s rm -f $f
+    e s qemu-img create -o preallocation=metadata -f qcow2 $f 50G
+  fi
 done
 
 if [[ $SSH_CLIENT ]]; then
-    console_arg=--noautoconsole
-else
-    console_arg='&'
+  console_arg=--noautoconsole
 fi
 
+# docker makes forward default to drop, which blocks the vm pxe on flidas. easiest solution:
+s iptables -P FORWARD ACCEPT
+
 # --cpu host: this causes mkfs.btrfs to fail with a stack trace which began
 # something like:
 # init_module+0x108/0x1000 [raid6_pq]
-s virt-install --os-variant $variant  -n $name --pxe -r 2048 --vcpus 1 \
-  ${disk_arg[*]} -w bridge=br0,mac=52:54:00:9c:ef:ad \
-  --graphics spice,listen=0.0.0.0 $console_arg
+#
+# uniq is to stop gtk-warning spam
+# e s virt-install --os-variant $variant  -n $name --pxe -r 2048 --vcpus 1 \
+  #   ${disk_arg[*]} -w bridge=br0,mac=52:54:00:9c:ef:ad $reboot_arg \
+  #   --graphics spice,listen=0.0.0.0 $console_arg |& grep -v '^ *$' | uniq &
 
-if [[ ${0##*/} == arch-revm ]]; then
-    sleep 80
-    ./arch-init-remote $name
+
+e s virt-install --os-variant $variant  -n $name $boot_arg -r 2048 --vcpus 1 \
+  ${disk_arg[*]} -w bridge=br0,mac=52:54:00:9c:ef:ad $reboot_arg \
+  --graphics spice,listen=0.0.0.0 $console_arg |& grep -v '^ *$' | uniq &
+
+
+if [[ $SSH_CLIENT ]]; then
+  fg
+fi
+
+sleep 30
+while ! timeout -s 9 10 ssh -oBatchMode=yes root@$name /bin/true; do
+  e sleep 5
+done
+unset _errcatch_cleanup
+e ./pxe-server $dhcp_arg
+if is_arch_revm; then
+  ./arch-init-remote $name
 fi