airship
/
promenade
Code Issues Proposed changes

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
This commit is contained in:
Mark Burnett 2017-11-13 16:01:33 -06:00
parent d6a832e77f
commit 38ea3337e9
4 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools/g2/lib/virsh.sh
View File

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

3
tools/g2/stages/join-masters.sh
View File

@ -16,6 +16,9 @@ for NAME in ${JOIN_TARGETS}; do
ssh_cmd "${NAME}" "/root/promenade/join-${NAME}.sh" ssh_cmd "${NAME}" "/root/promenade/join-${NAME}.sh"
ssh_cmd "${NAME}" "/root/promenade/validate-${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 done
validate_cluster n0 validate_cluster n0

3
tools/g2/stages/reprovision-genesis.sh
View File

@ -20,3 +20,6 @@ validate_cluster n1
validate_etcd_membership kubernetes n1 "${EXPECTED_MEMBERS}" validate_etcd_membership kubernetes n1 "${EXPECTED_MEMBERS}"
validate_etcd_membership calico 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

1
tools/stop_gate.sh
View File

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