openstack/devstack
Code Issues Proposed changes

allow build_libvirt.sh not to destroy/recreate net

Browse Source
This commit is contained in:
Jesse Andrews 2011-11-01 19:46:17 -07:00
parent 037d3bdea4
commit 1d1dda1457
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tools/build_libvirt.sh
View File

@ -174,6 +174,7 @@ unmount_images
# Network configuration variables # Network configuration variables
GUEST_NETWORK=${GUEST_NETWORK:-1} GUEST_NETWORK=${GUEST_NETWORK:-1}
GUEST_RECREATE_NET=${GUEST_RECREATE_NET:-yes}
GUEST_IP=${GUEST_IP:-192.168.$GUEST_NETWORK.50} GUEST_IP=${GUEST_IP:-192.168.$GUEST_NETWORK.50}
GUEST_CIDR=${GUEST_CIDR:-$GUEST_IP/24} GUEST_CIDR=${GUEST_CIDR:-$GUEST_IP/24}
@ -194,8 +195,10 @@ cat > $NET_XML <<EOF
</network> </network>
EOF EOF
virsh net-destroy devstack-$GUEST_NETWORK || true if [[ "$GUEST_RECREATE_NET" == "yes" ]]; then
virsh net-create $VM_DIR/net.xml virsh net-destroy devstack-$GUEST_NETWORK || true
virsh net-create $VM_DIR/net.xml
fi
# libvirt.xml configuration # libvirt.xml configuration
LIBVIRT_XML=$VM_DIR/libvirt.xml LIBVIRT_XML=$VM_DIR/libvirt.xml