From a311a5e38b8a37b54577806d0a3ac05cc13fcf94 Mon Sep 17 00:00:00 2001
From: Kevin Carter <kevin.carter@rackspace.com>
Date: Wed, 3 Dec 2014 12:47:15 -0600
Subject: [PATCH] Adds the my_ip value to the cinder.conf

This adds the my_ip value which is defaulting to the container address
which causes the iscsi mount problems. This is an issue in Juno +.

Change-Id: Ie1e3d4dbecad97e43a43bcd4ca404a3c30740bd0
Closes-Bug: 1398924
---
 rpc_deployment/roles/cinder_common/templates/cinder.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/rpc_deployment/roles/cinder_common/templates/cinder.conf b/rpc_deployment/roles/cinder_common/templates/cinder.conf
index 7f4f769158..8d7e752895 100644
--- a/rpc_deployment/roles/cinder_common/templates/cinder.conf
+++ b/rpc_deployment/roles/cinder_common/templates/cinder.conf
@@ -1,6 +1,8 @@
 [DEFAULT]
 verbose = {{ verbose }}
 debug = {{ debug }}
+my_ip = {{ storage_address | default(container_address) }}
+
 
 rpc_backend = {{ rpc_backend }}
 rabbit_hosts = {{ rabbit_hosts }}
@@ -37,7 +39,7 @@ default_volume_type = {{ cinder_default_volume_type }}
 
 iscsi_helper = {{ cinder_iscsi_helper | default('tgtadm') }}
 iscsi_iotype = {{ cinder_iscsi_iotype | default('fileio') }}
-iscsi_ip_address = {{ storage_address | default(container_address) }}
+iscsi_ip_address = $my_ip
 iscsi_num_targets = {{ cinder_iscsi_num_targets | default('100') }}
 iscsi_port = {{ cinder_iscsi_port | default('3260') }}