@@ -90,9 +90,10 @@ GUEST_CORES=${GUEST_CORES:-1}

 # libvirt.xml configuration

 NET_XML=$vm_dir/net.xml

+NET_NAME=${NET_NAME:-devstack-$GUEST_NETWORK}

 cat > $NET_XML <<EOF

 <network>

-  <name>devstack-$GUEST_NETWORK</name>

+  <name>$NET_NAME</name>

   <bridge name="stackbr%d" />

   <forward/>

   <ip address="$GUEST_GATEWAY" netmask="$GUEST_NETMASK">

@@ -104,9 +105,9 @@ cat > $NET_XML <<EOF

 EOF

 if [[ "$GUEST_RECREATE_NET" == "yes" ]]; then

-    virsh net-destroy devstack-$GUEST_NETWORK || true

+    virsh net-destroy $NET_NAME || true

     # destroying the network isn't enough to delete the leases

-    rm -f /var/lib/libvirt/dnsmasq/devstack-$GUEST_NETWORK.leases

+    rm -f /var/lib/libvirt/dnsmasq/$NET_NAME.leases

     virsh net-create $vm_dir/net.xml

 fi

@@ -27,7 +27,6 @@ TOP_DIR=(pwd)

 BASE_NAME=executor-`printf "%02d" $EXECUTOR_NUMBER`

 GUEST_NAME=$BASE_NAME.$ADAPTER

 virsh destroy `virsh list | grep $BASE_NAME | cut -d " " -f1` || true

-rm -f /var/lib/libvirt/dnsmasq/$BASE_NAME*.leases

 # Configure localrc

 cat <<EOF >localrc

@@ -43,6 +42,7 @@ SERVICE_TOKEN=chicken

 ADMIN_PASSWORD=chicken

 USERNAME=admin

 TENANT=admin

+NET_NAME=$GUEST_NAME

 EOF

 cd tools

 sudo ./build_uec.sh