2017 deploy 1box

build-nii.sh

@@ -143,36 +143,6 @@ EOF
 	    ) ; prev_cmd_failed
 	done
 
-	(
-	    $starting_step "Set default password for jupyter, plus other easy initial setup"
-	    JCFG="/home/centos/.jupyter/jupyter_notebook_config.py"
-	    [ -x "$DATADIR/vmdir/ssh-to-kvm.sh" ] && {
-		[ -f "$DATADIR/vmdir/1box-openvz-w-jupyter.raw.tar.gz" ] || \
-		    "$DATADIR/vmdir/ssh-to-kvm.sh" grep sha1 "$JCFG" 2>/dev/null 1>&2
-	    }
-	    $skip_step_if_already_done ; set -e
-
-	    # http://jupyter-notebook.readthedocs.org/en/latest/public_server.html
-	    "$DATADIR/vmdir/ssh-to-kvm.sh" <<EOF
-set -x
-[ -f "$JCFG" ] || jupyter notebook --generate-config
-
-# set default password
-saltpass="\$(echo $'from notebook.auth import passwd\nprint(passwd("${JUPYTER_PASSWORD:=warmwinter}"))' | python)"
-echo "c.NotebookApp.password = '\$saltpass'" >>"$JCFG"
-echo "c.NotebookApp.ip = '*'" >>"$JCFG"
-
-# move jupyter's default directory away from \$HOME
-mkdir notebooks
-echo "c.NotebookApp.notebook_dir = 'notebooks'" >>"$JCFG"
-
-# autostart on boot
-echo "(setsid su - centos -c '/home/centos/anaconda3/bin/jupyter notebook' > /var/log/jupyter.log 2>&1) &" | \
-   sudo bash -c "cat >>/etc/rc.local"
-EOF
-	) ; prev_cmd_failed
-
-
 	# function is called remotely in the next step below
 	do_register_keypair()
 	{
@@ -312,6 +282,45 @@ EOF
 	    ) | "$DATADIR/vmdir/ssh-to-kvm.sh"
 	)
 
+	(
+	    $starting_group "Install customized machine image into OpenVZ 1box image"
+	    imagefile="centos-6.6.x86_64.openvz.md.raw.tar.gz"
+	    imageid="bo-centos1d64"
+	    ! [ -f "$DATADIR/$imagefile" ]
+	    $skip_group_if_unnecessary
+
+	    (
+		$starting_step "Compute backup object parameters for customized image"
+		[ -f "$DATADIR/$imagefile.params" ]
+
+		$skip_step_if_already_done; set -e
+		"$DATADIR/vmapp-vdc-1box/gen-image-size-params.sh" \
+		    "$DATADIR/$imagefile" >"$DATADIR/$imagefile.params"
+	    ) ; prev_cmd_failed
+
+	    (
+		$starting_step "Install customized image"
+
+		[ -x "$DATADIR/vmdir/ssh-to-kvm.sh" ] &&
+		    "$DATADIR/vmdir/ssh-to-kvm.sh" '[ -d /var/lib/wakame-vdc/images/hide ]' 2>/dev/null
+		$skip_step_if_already_done; set -e
+
+		( cd "$DATADIR" &&
+			tar c "$imagefile" | "$DATADIR/vmdir/ssh-to-kvm.sh" tar xv
+		)
+		"$DATADIR/vmdir/ssh-to-kvm.sh" <<EOF
+set -x
+sudo mkdir -p /var/lib/wakame-vdc/images/hide
+sudo mv /var/lib/wakame-vdc/images/$imagefile /var/lib/wakame-vdc/images/hide
+sudo mv /home/centos/$imagefile /var/lib/wakame-vdc/images
+
+/opt/axsh/wakame-vdc/dcmgr/bin/vdc-manage backupobject modify \
+   $imageid $(cat "$DATADIR/$imagefile.params")
+
+EOF
+	    ) ; prev_cmd_failed
+	)
+
 	# TODO: this guard is awkward.
 	[ -x "$DATADIR/vmdir/kvm-shutdown-via-ssh.sh" ] && \
 	    "$DATADIR/vmdir/kvm-shutdown-via-ssh.sh"
@@ -353,14 +362,14 @@ EOF
 ) ; prev_cmd_failed
 
 (
-    $starting_step "Synchronize notebooks/ to VM"
+    $starting_step "Synchronize bin/ and notebooks/.downloads to VM"
     [ -x "$DATADIR/vmdir/ssh-to-kvm.sh" ] && {
-	"$DATADIR/vmdir/ssh-to-kvm.sh" '[ "$(ls notebooks)" != "" ]' 2>/dev/null
+	"$DATADIR/vmdir/ssh-to-kvm.sh" '[ "$(ls bin)" != "" ]' 2>/dev/null
     }
     $skip_step_if_already_done; set -e
-
+    
     "$DATADIR/notebooks-sync.sh" tovm bin
-    "$DATADIR/notebooks-sync.sh" tovm
+    "$DATADIR/notebooks-sync.sh" tovm notebooks/.downloads
 ) ; prev_cmd_failed
 
 (
@@ -406,43 +415,15 @@ EOF
 ) ; prev_cmd_failed
 
 (
-    $starting_group "Install customized machine image into OpenVZ 1box image"
-    imagefile="centos-6.6.x86_64.openvz.md.raw.tar.gz"
-    imageid="bo-centos1d64"
-    ! [ -f "$DATADIR/$imagefile" ]
+    $starting_group "Hide unused steps"
+
+    ## This step is removed from the build because it caused trouble
+    ## with the load balancer.  Instead of removing it, I am blocking
+    ## its execution with a group so that it can still be forced to
+    ## execute (using the bashctrl.sh wrapper script) for some
+    ## anticipated debugging/testing work.
+    true
     $skip_group_if_unnecessary
-
-    (
-	$starting_step "Compute backup object parameters for customized image"
-	[ -f "$DATADIR/$imagefile.params" ]
-
-	$skip_step_if_already_done; set -e
-	"$DATADIR/vmapp-vdc-1box/gen-image-size-params.sh" \
-	    "$DATADIR/$imagefile" >"$DATADIR/$imagefile.params"
-    ) ; prev_cmd_failed
-
-    (
-	$starting_step "Install customized image"
-
-	[ -x "$DATADIR/vmdir/ssh-to-kvm.sh" ] &&
-	    "$DATADIR/vmdir/ssh-to-kvm.sh" '[ -d /var/lib/wakame-vdc/images/hide ]' 2>/dev/null
-	$skip_step_if_already_done; set -e
-
-	( cd "$DATADIR" &&
-		tar c "$imagefile" | "$DATADIR/vmdir/ssh-to-kvm.sh" tar xv
-	)
-	"$DATADIR/vmdir/ssh-to-kvm.sh" <<EOF
-set -x
-sudo mkdir -p /var/lib/wakame-vdc/images/hide
-sudo mv /var/lib/wakame-vdc/images/$imagefile /var/lib/wakame-vdc/images/hide
-sudo mv /home/centos/$imagefile /var/lib/wakame-vdc/images
-
-/opt/axsh/wakame-vdc/dcmgr/bin/vdc-manage backupobject modify \
-   $imageid $(cat "$DATADIR/$imagefile.params")
-
-EOF
-    ) ; prev_cmd_failed
-
     (
 	$starting_step "Removed demo2 through demo8 and minimum from launch instance"
 
@@ -471,4 +452,74 @@ MMM
 
 EOF
     ) ; prev_cmd_failed
-)
+) ; prev_cmd_failed
+
+(
+    $starting_step "Set default password for jupyter, plus other easy initial setup"
+    JCFG="/home/centos/.jupyter/jupyter_notebook_config.py"
+    [ -x "$DATADIR/vmdir/ssh-to-kvm.sh" ] && \
+	    "$DATADIR/vmdir/ssh-to-kvm.sh" grep sha1 "$JCFG" 2>/dev/null 1>&2
+    $skip_step_if_already_done ; set -e
+
+    # http://jupyter-notebook.readthedocs.org/en/latest/public_server.html
+    "$DATADIR/vmdir/ssh-to-kvm.sh" <<EOF
+set -x
+[ -f "$JCFG" ] || jupyter notebook --generate-config
+
+# set default password
+saltpass="\$(echo $'from notebook.auth import passwd\nprint(passwd("${JUPYTER_PASSWORD:=warmwinter}"))' | python)"
+echo "c.NotebookApp.password = '\$saltpass'" >>"$JCFG"
+echo "c.NotebookApp.ip = '*'" >>"$JCFG"
+
+# move jupyter's default directory away from \$HOME
+mkdir notebooks
+echo "c.NotebookApp.notebook_dir = 'notebooks'" >>"$JCFG"
+
+# autostart on boot
+echo "(setsid su - centos -c '/home/centos/anaconda3/bin/jupyter notebook' >> /var/log/jupyter.log 2>&1) &" | \
+   sudo bash -c "cat >>/etc/rc.local"
+
+# We could start jupyter directly now, but let's do a shutdown/boot
+# cycle to test that is working option in case unexpected problems occur.
+# Need to set flag below.
+EOF
+    touch "$DATADIR/reboot1box" # necessary to use a file because inside a subprocess
+) ; prev_cmd_failed
+
+if [ "$reboot1box" != "" ] || \
+       [ -f "$DATADIR/reboot1box" ] ; then  # this flag can also be set before calling ./build-nii.sh
+    rm -f "$DATADIR/reboot1box"
+    [ -x "$DATADIR/vmdir/kvm-shutdown-via-ssh.sh" ] && \
+	"$DATADIR/vmdir/kvm-shutdown-via-ssh.sh"
+fi
+
+[ -x "$DATADIR/vmdir/kvm-boot.sh" ] && \
+    "$DATADIR/vmdir/kvm-boot.sh"
+
+(
+    $starting_step "Synchronize *all* of notebooks/ to VM, if fullsync=true"
+    [ "$fullsync" != "true" ]
+    $skip_step_if_already_done; set -e
+
+    "$DATADIR/notebooks-sync.sh" tovm
+) ; prev_cmd_failed
+
+(
+    $starting_step "Synchronize day1 notebooks/ to VM, if day1sync=true"
+    [ "$day1sync" != "true" ]
+    $skip_step_if_already_done; set -e
+
+    cd "$DATADIR"
+    ./notebooks-sync.sh tovm notebooks/stepdefs  # always sync all stepdefs
+    ./safe-sync-files.sh notebooks/1*
+) ; prev_cmd_failed
+
+(
+    $starting_step "Synchronize day2 notebooks/ to VM, if day2sync=true"
+    [ "$day2sync" != "true" ]
+    $skip_step_if_already_done; set -e
+
+    cd "$DATADIR"
+    ./notebooks-sync.sh tovm notebooks/stepdefs  # always sync all stepdefs
+    ./safe-sync-files.sh notebooks/2*
+) ; prev_cmd_failed

deploy/deploy-1box.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+#
+# run this file on some bare metal to deploy setup 1box environments
+# the 1box image files needs to be placed in the same folder as this script
+#
+# usage:
+# ./deploy-1box <n>, where <n> is the numbers of 1box environments
+#
+# ports exposed: <current_dir>/boxes/box_<n>/kvm.ports
+# kvm boot cmd: <current_dir>/boxes/box_<n>/kvm.cmdline
+# kvm pid: <current_dir>/boxes/box_<n>/box_<n>.pid
+
+BOX_CNT=${1}
+CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+ONEBOX_IMG="${CURRENT_DIR}/1box.tar.gz"
+PORT_FORWARD=(
+    22    0.0.0.0    # ssh on 1box
+    5222  0.0.0.0    # socat service redirecting to 10.0.2.100:8080 (vdc instance)
+    9000  0.0.0.0    # wakame gui
+    9001  0.0.0.0    # wakame api
+    8080  0.0.0.0    # socat service redirectiong to 10.0.2.100:8080 (vdc jenkins service)
+)
+
+# [[ -f "${ONEBOX_IMG}" ]] || { echo "Missing 1box image" ; exit 1 ; }
+. ${CURRENT_DIR}/generate-qemu-cmd.sh
+
+for (( i=0; i < ${BOX_CNT} ; i++ )) ; do
+    echo "Deploying box ${i}"
+    box_path="${CURRENT_DIR}/boxes/box_${i}"
+    mkdir -p "${box_path}"
+    [[ -f "${box_path}/box.img" ]] || tar Sxvf 1box.tar.gz -C "${box_path}"
+    [[ -f "${box_path}/kvm.cmdline" ]] || build_qemu_cmd "${i}" "${box_path}"
+    [[ -f "${box_path}/box_${i}.pid" ]] || {
+        cat "${box_path}/kvm.cmdline"
+        ./preconfigure-cienv.sh $(( 22 + 10000 + ( i * 10 ) )) "${box_path}/1box-key"
+    }
+done

deploy/generate-qemu-cmd.sh

@@ -0,0 +1,49 @@
+#!/bin/bash
+set -x
+
+build_hostfwd_param()
+{
+    local idx=${1}
+    local box_path="${2}"
+    rm -f ${box_path}/kvm.open_ports
+
+    for (( i=0 ; i < ${#PORT_FORWARD[@]} ; i+=2 )) ; do
+        port="${PORT_FORWARD[i]}"
+        host="${PORT_FORWARD[$(( i + 1 ))]}"
+        access_port=$(( port + 10000 + ( idx  * 10 ) ))
+        # make sure the access port is not used
+        until [[ ! "${ret_val}" == *"${access_port}-"* ]] ; do
+            [[ ! -f ${box_path}/kvm.open_ports ]] && break
+            access_port=$(( access_port + 1 ))
+        done
+        ret_val="${ret_val}hostfwd=tcp::${access_port}-${host}:${port},"
+        echo "port: ${access_port} -> ${host}:${port}" >> ${box_path}/kvm.ports
+    done
+
+    echo "${ret_val%,*}"
+}
+
+build_qemu_cmd()
+{
+    local idx="${1}"
+    local box_path="${2}"
+    local vnc_port="${vnc_port:-11050}"
+    local serial_port="${serial_port:-14060}"
+    local mac_addr="${mac_addr:-02:00:00:00:00:0${idx}}"
+
+    cat <<- EOF > "${box_path}/kvm.cmdline"
+qemu-system-x86_64 \
+	-machine accel=kvm \
+	-cpu ${cpu_type:-qemu64,+vmx} \
+	-m ${mem_size:-4096} \
+	-smp ${cpu_num:-2} \
+	-vnc ${vnc_addr:-localhost}:$(( vnc_port + idx)) \
+	-serial telnet:127.0.0.1:$(( serial_port + idx )),server,nowait \
+	-serial pty \
+	-drive file=${box_path}/box.img,media=disk,if=virtio,format=${format:-qcow2} \
+	-net nic,vlan=0,macaddr=${mac_addr},model=virtio,addr=$(( 3 + idx )) \
+	-net user,vlan=0,$(build_hostfwd_param ${idx} ${box_path}) \
+	-daemonize \
+	-pidfile ${box_path}/${vm_name:-box_${idx}}.pid
+EOF
+}