From 207189b582f5bb5ddc414a755eb45cf00a0c6c79 Mon Sep 17 00:00:00 2001
From: Aviram Bar-Haim <aviramb@mellanox.com>
Date: Mon, 10 Nov 2014 11:04:23 +0200
Subject: [PATCH] Set iser_ip_address with a storage network address

The iser_ip_address parameter in /etc/cinder/cinder.conf
has a wrong value.

This parameter has to be configured with the storage
endpoint address, since it is no longer inherits the
iscsi_ip_address by default.

Currently it uses the $my_ip value, which is not capable
to work with RDMA transport (with its default value).

This fix assures that the default iser_ip_address will
use an address with RDMA support, if iSER is chosen as
the iSCSI transport by the user.

Closes-bug: #1387794

Change-Id: If0f67a9dbe80bfc8655dab85a96d3621bdaf38da
---
 deployment/puppet/mellanox_openstack/manifests/cinder.pp | 4 ++++
 deployment/puppet/openstack/manifests/cinder.pp          | 3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/deployment/puppet/mellanox_openstack/manifests/cinder.pp b/deployment/puppet/mellanox_openstack/manifests/cinder.pp
index cc74db5f12..1dc9606d31 100644
--- a/deployment/puppet/mellanox_openstack/manifests/cinder.pp
+++ b/deployment/puppet/mellanox_openstack/manifests/cinder.pp
@@ -1,9 +1,13 @@
 class mellanox_openstack::cinder (
   $iser = false,
+  $iser_ip_address,
 ) {
   if $iser {
     cinder_config { 'DEFAULT/volume_driver' :
       value => 'cinder.volume.drivers.lvm.LVMISERDriver'
     }
+    cinder_config { 'DEFAULT/iser_ip_address' :
+      value => $iser_ip_address
+    }
   }
 }
diff --git a/deployment/puppet/openstack/manifests/cinder.pp b/deployment/puppet/openstack/manifests/cinder.pp
index 1ac0060dcc..a3acc91075 100644
--- a/deployment/puppet/openstack/manifests/cinder.pp
+++ b/deployment/puppet/openstack/manifests/cinder.pp
@@ -150,7 +150,8 @@ class openstack::cinder(
           volume_group     => $volume_group,
         }
         class { 'mellanox_openstack::cinder':
-          iser => $iser
+          iser            => $iser,
+          iser_ip_address => $iscsi_bind_host,
         }
       }
       'vmdk': {