diff --git a/README.md b/README.md
index 8ac2d5f..aaf1219 100644
--- a/README.md
+++ b/README.md
@@ -80,6 +80,8 @@ TODO: move rabbit parameters under openstack["block-storage"]["mq"]
 * `openstack["block-storage"]["volume"]["driver"]` - Driver to use for volume creation
 * `openstack["block-storage"]["volume"]["volume_group"]` - Name for the VG that will contain exported volumes
 * `openstack["block-storage"]["volume"]["iscsi_helper"]` - ISCSI target user-land tool to use
+* `openstack["block-storage"]["volume"]["iscsi_ip_address"]` - The IP address where the iSCSI daemon is listening on
+* `openstack["block-storage"]["volume"]["iscsi_port"]` - The port where the iSCSI daemon is listening on
 * `openstack["block-storage"]["rbd_pool"]` - RADOS Block Device pool to use
 * `openstack["block-storage"]["rbd_user"]` - User for Cephx Authentication
 * `openstack["block-storage"]["rbd_secret_uuid"]` - Secret UUID for Cephx Authentication
diff --git a/attributes/default.rb b/attributes/default.rb
index cb1c0f0..df09bc6 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -139,6 +139,8 @@ default["openstack"]["block-storage"]["volume"]["state_path"] = "/var/lib/cinder
 default["openstack"]["block-storage"]["volume"]["driver"] = "cinder.volume.driver.ISCSIDriver"
 default["openstack"]["block-storage"]["volume"]["volume_group"] = "cinder-volumes"
 default["openstack"]["block-storage"]["volume"]["iscsi_helper"] = "tgtadm"
+default["openstack"]["block-storage"]["volume"]["iscsi_ip_address"] = node["ipaddress"]
+default["openstack"]["block-storage"]["volume"]["iscsi_port"] = "3260"
 
 # Ceph/RADOS options
 default["openstack"]["block-storage"]["rbd_pool"] = "rbd"
diff --git a/templates/default/cinder.conf.erb b/templates/default/cinder.conf.erb
index 981b16a..0d5fd26 100644
--- a/templates/default/cinder.conf.erb
+++ b/templates/default/cinder.conf.erb
@@ -551,11 +551,12 @@ volume_group=<%= node["openstack"]["block-storage"]["volume"]["volume_group"] %>
 # iscsi_target_prefix=iqn.2010-10.org.openstack:
 #### (StrOpt) prefix for iscsi volumes
 
-# iscsi_ip_address=$my_ip
-#### (StrOpt) use this ip for iscsi
+iscsi_ip_address=<%= node["openstack"]["block-storage"]["volume"]["iscsi_ip_address"] %>
+#### (StrOpt) The IP address where the iSCSI daemon is listening on
 
-# iscsi_port=3260
+iscsi_port=<%= node["openstack"]["block-storage"]["volume"]["iscsi_port"] %>
 #### (IntOpt) The port that the iSCSI daemon is listening on
+
 <% if node["openstack"]["block-storage"]["volume"]["driver"] == "cinder.volume.drivers.RBDDriver" %>
 rbd_pool=<%= node["openstack"]["block-storage"]["rbd_pool"] %>
 #### (StrOpt) the RADOS pool in which rbd volumes are stored