Configure multipath.

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

diff --git a/debian/changelog b/debian/changelog
index facfb8a..a0e216d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 xvm-iscsi-config (0.0.7) unstable; urgency=low
 
   * Configure iSCSI for multipath on eth0 and eth1.
+  * Configure multipath.
 
- -- Evan Broder <broder@mit.edu>  Wed, 14 Jan 2009 19:45:56 -0500
+ -- Evan Broder <broder@mit.edu>  Wed, 14 Jan 2009 19:51:24 -0500
 
 xvm-iscsi-config (0.0.6) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 9be4c61..a3b8a72 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.8.0
 
 Package: xvm-iscsi-config
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, invirt-base, open-iscsi
+Depends: ${shlibs:Depends}, ${misc:Depends}, invirt-base, open-iscsi, multipath-tools
 Description: iSCSI configuration for SIPB's XVM project
  This package should be installed on all XVM host machines to
  configure the iSCSI shared storage array.

diff --git a/debian/rules b/debian/rules
index 9394358..26c49ed 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,8 @@
 DEB_DIVERT_EXTENSION = .xvm
 
 DEB_DIVERT_FILES_xvm-iscsi-config += \
-       /etc/iscsi/iscsid.conf.xvm
+       /etc/iscsi/iscsid.conf.xvm \
+       /etc/multipath.conf.xvm
 
 DEB_DH_INSTALLINIT_ARGS += --no-start
 DEB_UPDATE_RCD_PARAMS_xvm-iscsi-config += defaults 20 80

diff --git a/debian/xvm-iscsi-config.install b/debian/xvm-iscsi-config.install
index 1b7b075..abbc5e6 100644 (file)
--- a/debian/xvm-iscsi-config.install
+++ b/debian/xvm-iscsi-config.install
@@ -1,2 +1,3 @@
 debian/iscsid.conf.xvm.mako etc/iscsi
 ifaces etc/iscsi
+multipath.conf.xvm etc

diff --git a/multipath.conf.xvm b/multipath.conf.xvm
new file mode 100644 (file)
index 0000000..98b2a00
--- /dev/null
+++ b/multipath.conf.xvm
@@ -0,0 +1,3 @@
+defaults {
+    no_path_retry queue
+}