Improvements to DevStack's XenServer scripts
I have ensured:
- template gets re-used on second run
- template includes XenServer tools, and custom user accounts
- take snapshot before first boot, for easy re-run
- make host_ip_iface work with either eth2 or eth3
- make ssh into domU checks looser
- above is all ground work for improved jenkins tests
- added some more comments to make it scripts clearer
Change-Id: I5c45370bf8a1393d669480e196b13f592d29154f
diff --git a/tools/xen/xenrc b/tools/xen/xenrc
index f434b11..bf3d16a 100644
--- a/tools/xen/xenrc
+++ b/tools/xen/xenrc
@@ -5,12 +5,15 @@
# Size of image
VDI_MB=${VDI_MB:-5000}
+OSDOMU_MEM_MB=1024
# VM Password
GUEST_PASSWORD=${GUEST_PASSWORD:-secrete}
-# Host Interface, i.e. the public facing interface on the nova vm
-HOST_IP_IFACE=${HOST_IP_IFACE:-eth0}
+# Host Interface, i.e. the interface on the nova vm you want to expose the services on
+# Usually either eth2 (management network) or eth3 (public network)
+# not eth0 (private network with XenServer host) or eth1 (VM traffic network)
+HOST_IP_IFACE=${HOST_IP_IFACE:-eth3}
# Our nova host's network info
VM_IP=${VM_IP:-10.255.255.255} # A host-only ip that let's the interface come up, otherwise unused
@@ -35,7 +38,5 @@
MGT_VLAN=${MGT_VLAN:-101}
MGT_DEV=${MGT_DEV:-eth0}
-OSDOMU_MEM_MB=1024
-
# Source params
cd ../.. && source ./stackrc && cd $TOP_DIR