Minor updates to gate config

* Cleanup network in stop_gate.sh
* Use more reliable disk options
* Flush VM disk cache after join

Change-Id: Ia1f50842e6055aaf908f9932786dad691a2e9546

tools/g2/lib/virsh.sh

@@ -75,8 +75,10 @@ iso_path() {
 }
 
 net_clean() {
-    log net_clean is not yet implemented.
-    exit 1
+    if virsh net-list --name | grep ^promenade$ > /dev/null; then
+        log Destroying promenade network
+        virsh net-destroy "${XML_DIR}/network.xml" &>> "${LOG_FILE}"
+    fi
 }
 
 net_declare() {
@@ -120,6 +122,7 @@ vm_create() {
     vol_create_root "${NAME}"
 
     log Creating VM "${NAME}"
+    DISK_OPTS="bus=virtio,cache=directsync,discard=unmap,format=qcow2"
     virt-install \
         --name "${NAME}" \
         --virt-type kvm \
@@ -130,9 +133,9 @@ vm_create() {
         --vcpus "$(config_vm_vcpus)" \
         --memory "$(config_vm_memory)" \
         --import \
-        --disk "vol=${VIRSH_POOL}/promenade-${NAME}.img,format=qcow2,bus=virtio" \
-        --disk "pool=${VIRSH_POOL},size=20,format=qcow2,bus=virtio" \
-        --disk "pool=${VIRSH_POOL},size=20,format=qcow2,bus=virtio" \
+        --disk "vol=${VIRSH_POOL}/promenade-${NAME}.img,${DISK_OPTS}" \
+        --disk "pool=${VIRSH_POOL},size=20,${DISK_OPTS}" \
+        --disk "pool=${VIRSH_POOL},size=20,${DISK_OPTS}" \
         --disk "vol=${VIRSH_POOL}/cloud-init-${NAME}.iso,device=cdrom" &>> "${LOG_FILE}"
 
     ssh_wait "${NAME}"

tools/g2/stages/join-masters.sh

@@ -16,6 +16,9 @@ for NAME in ${JOIN_TARGETS}; do
 
     ssh_cmd "${NAME}" "/root/promenade/join-${NAME}.sh"
     ssh_cmd "${NAME}" "/root/promenade/validate-${NAME}.sh"
+
+    # NOTE(mark-burnett): Ensure disk cache is flushed after join.
+    ssh_cmd "${NAME}" sync
 done
 
 validate_cluster n0

tools/g2/stages/reprovision-genesis.sh

@@ -20,3 +20,6 @@ validate_cluster n1
 
 validate_etcd_membership kubernetes n1 "${EXPECTED_MEMBERS}"
 validate_etcd_membership calico n1 "${EXPECTED_MEMBERS}"
+
+# NOTE(mark-burnett): Ensure disk cache is flushed after join.
+ssh_cmd "${GENESIS_NAME}" sync

tools/stop_gate.sh

@@ -12,4 +12,5 @@ export WORKSPACE
 source "${GATE_UTILS}"
 
 vm_clean_all
+net_clean
 registry_down