From: Eric Harney <eharney@redhat.com>
Date: Tue, 17 Mar 2015 16:33:42 +0000 (-0400)
Subject: LIO: Enable iSER for IPv6
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=1acf03cabda633700cd315c73259a66f46e1c629;p=openstack-build%2Fcinder-build.git

LIO: Enable iSER for IPv6

Commit
  ffdfd0f Support iSER driver within the ISCSITarget flow
introduced support for iSER with LIO, but it only enables
iSER for the IPv4 portal.  If we created an IPv6 portal,
enable it there as well.

Change-Id: I1684bba6fc2b775acdee70b6ad0fc0568aaebeac
---

diff --git a/cinder/cmd/rtstool.py b/cinder/cmd/rtstool.py
index c132f28f3..5293d633c 100644
--- a/cinder/cmd/rtstool.py
+++ b/cinder/cmd/rtstool.py
@@ -83,12 +83,22 @@ def create(backing_device, name, userid, password, iser_enabled,
                 'RDMA is supported on your iSCSI port.'))
         raise
 
+    portal = None
+
     try:
-        rtslib.NetworkPortal(tpg_new, '::0', 3260, mode='any')
+        portal = rtslib.NetworkPortal(tpg_new, '::0', 3260, mode='any')
     except rtslib.utils.RTSLibError:
         # TODO(emh): Binding to IPv6 fails sometimes -- let pass for now.
         pass
 
+    try:
+        if portal and iser_enabled == 'True':
+            portal.iser = True
+    except rtslib.utils.RTSLibError:
+        print (_('Error enabling iSER for IPv6 NetworkPortal: please '
+                 'ensure that RDMA is supported on your iSCSI port.'))
+        raise
+
 
 def _lookup_target(target_iqn, initiator_iqn):
     try: