Configure iSCSI on both backend interfaces.

svn path=/trunk/packages/xvm-iscsi-config/; revision=1979

diff --git a/debian/changelog b/debian/changelog
index 7f55a17..facfb8a 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xvm-iscsi-config (0.0.7) unstable; urgency=low
+
+  * Configure iSCSI for multipath on eth0 and eth1.
+
+ -- Evan Broder <broder@mit.edu>  Wed, 14 Jan 2009 19:45:56 -0500
+
 xvm-iscsi-config (0.0.6) unstable; urgency=low
 
   * tweak initscript to emit log messages correctly

diff --git a/debian/xvm-iscsi-config.install b/debian/xvm-iscsi-config.install
index 1b41226..1b7b075 100644 (file)
--- a/debian/xvm-iscsi-config.install
+++ b/debian/xvm-iscsi-config.install
@@ -1 +1,2 @@
-debian/iscsid.conf.xvm.mako etc/iscsi
\ No newline at end of file
+debian/iscsid.conf.xvm.mako etc/iscsi
+ifaces etc/iscsi

diff --git a/debian/xvm-iscsi-config.postinst b/debian/xvm-iscsi-config.postinst
index 1722daa..0b7a06e 100755 (executable)
--- a/debian/xvm-iscsi-config.postinst
+++ b/debian/xvm-iscsi-config.postinst
@@ -48,13 +48,13 @@ EOF
         if [ -z "$2" ]; then
             invoke-rc.d xvm-iscsi-config restart
             invoke-rc.d open-iscsi restart
-            iscsiadm -m discovery -t st -p $(invirt-getconf iscsi.address):3260
+            iscsiadm -m discovery -t st -p $(invirt-getconf iscsi.address):3260 -I eth0 -I eth1
         elif ! diff /etc/invirt/conf.d/iscsi~ /etc/invirt/conf.d/iscsi >/dev/null; then
               cat <<EOF
 xvm-iscsi-config: The configuration has changed.  Restart iscsi:
   /etc/init.d/xvm-iscsi-config restart
   /etc/init.d/open-iscsi restart
-  iscsiadm -m discovery -t st -p $(invirt-getconf iscsi.address):3260
+  iscsiadm -m discovery -t st -p $(invirt-getconf iscsi.address):3260 -I eth0 -I eth1
   lvchange -a ln /dev/xenvg && lvchange -a y /dev/xenvg
 This will leave VMs unable to access their disks, so migrate them first.
 

diff --git a/ifaces/eth0 b/ifaces/eth0
new file mode 100644 (file)
index 0000000..046fb93
--- /dev/null
+++ b/ifaces/eth0
@@ -0,0 +1,2 @@
+iface.transport_name = tcp
+iface.net_ifacename = eth0

diff --git a/ifaces/eth1 b/ifaces/eth1
new file mode 100644 (file)
index 0000000..26ca81c
--- /dev/null
+++ b/ifaces/eth1
@@ -0,0 +1,2 @@
+iface.transport_name = tcp
+iface.net_ifacename = eth1