Merge branch 'dev' of ssh://raid.local.hde.co.jp/hde/karesansui/karesansui into dev

Conflicts:
	karesansui/lib/const.py

diff --cc karesansui/lib/const.py
index c963534,5b2b5fa..e1dc281
--- 1/karesansui/lib/const.py
--- 2/karesansui/lib/const.py
+++ b/karesansui/lib/const.py
@@@ -49,6 -49,6 +49,9 @@@ VENDOR_BIN_DIR     = VENDOR_PREFIX + "/
  VENDOR_SBIN_DIR    = VENDOR_PREFIX + "/sbin"
  VENDOR_SYSCONF_DIR = "/etc/opt/hde"
  VENDOR_DATA_DIR    = "/var/opt/hde"
++VENDOR_DATA_ISCSI_DIR = VENDOR_DATA_DIR + "/iscsi"
++VENDOR_DATA_ISCSI_MOUNT_DIR = VENDOR_DATA_ISCSI_DIR + "/mount"
++VENDOR_DATA_ISCSI_DOMAINS_DIR = VENDOR_DATA_ISCSI_DIR + "/domains"
  VENDOR_LIBVIRT_RUN_DIR = "/var/run/hde-libvirt"
  XEN_SYSCONF_DIR    = "/etc/xen"