diff --git a/cinder/manifests/backend/emc_vnx.pp b/cinder/manifests/backend/emc_vnx.pp
index 5b060d39f..d185a1ddd 100644
--- a/cinder/manifests/backend/emc_vnx.pp
+++ b/cinder/manifests/backend/emc_vnx.pp
@@ -6,6 +6,12 @@
 #
 # == Parameters
 #
+# [*iscsi_initiators*]
+# 
+#   (required) IP addresses of the iSCSI initiator ports on all OpenStack nodes which want to connec to VNX via iSCSI
+#   Example: {"node1hostname":["10.0.0.1", "10.0.0.2"],"node2hostname":["10.0.0.3"]}
+#   Default to: none
+#
 # [*volume_backend_name*]
 #   (optional) Allows for the volume_backend_name to be separate of $name.
 #   Defaults to: $name
@@ -36,7 +42,7 @@
 #   Defaults to: 'present'
 #
 define cinder::backend::emc_vnx (
-  $iscsi_ip_address,
+  $iscsi_initiators,
   $san_ip,
   $san_password,
   $storage_vnx_pool_name,
@@ -51,7 +57,7 @@
 
   cinder_config {
     "${name}/default_timeout":            value => $default_timeout;
-    "${name}/iscsi_ip_address":           value => $iscsi_ip_address;
+    "${name}/iscsi_initiators":           value => $iscsi_initiators;
     "${name}/max_luns_per_storage_group": value => $max_luns_per_storage_group;
     "${name}/naviseccli_path":            value => '/opt/Navisphere/bin/naviseccli';
     "${name}/san_ip":                     value => $san_ip;
diff --git a/cinder/manifests/volume/emc_vnx.pp b/cinder/manifests/volume/emc_vnx.pp
index 5c50f176a..c0bd5ecfe 100644
--- a/cinder/manifests/volume/emc_vnx.pp
+++ b/cinder/manifests/volume/emc_vnx.pp
@@ -5,6 +5,12 @@
 #
 # === Parameters
 #
+# [*iscsi_initiators*]
+#
+#   (required) IP addresses of the iSCSI initiator ports on all OpenStack nodes which want to connec to VNX via iSCSI
+#   Example: {"node1hostname":["10.0.0.1", "10.0.0.2"],"node2hostname":["10.0.0.3"]}
+#   Default to: none
+#
 # [*san_ip*]
 #   (required) IP address of SAN controller.
 #
@@ -27,7 +33,7 @@
 #   Defaults to: '256'
 #
 class cinder::volume::emc_vnx(
-  $iscsi_ip_address,
+  $iscsi_initiators,
   $san_ip,
   $san_password,
   $storage_vnx_pool_name,
@@ -39,7 +45,7 @@
 
   cinder::backend::emc_vnx { 'DEFAULT':
     default_timeout            => $default_timeout,
-    iscsi_ip_address           => $iscsi_ip_address,
+    iscsi_initiators           => $iscsi_initiators,
     max_luns_per_storage_group => $max_luns_per_storage_group,
     package_ensure             => $package_ensure,
     san_ip                     => $san_ip,
diff --git a/cinder/spec/classes/cinder_volume_emc_vnx_spec.rb b/cinder/spec/classes/cinder_volume_emc_vnx_spec.rb
index 3372e1f57..808cd486a 100644
--- a/cinder/spec/classes/cinder_volume_emc_vnx_spec.rb
+++ b/cinder/spec/classes/cinder_volume_emc_vnx_spec.rb
@@ -6,7 +6,7 @@
       :san_ip                => '127.0.0.2',
       :san_login             => 'emc',
       :san_password          => 'password',
-      :iscsi_ip_address      => '127.0.0.3',
+      :iscsi_initiators      => '{"node1hostname":["10.0.0.1", "10.0.0.2"],"node2hostname":["10.0.0.3"]}',
       :storage_vnx_pool_name => 'emc-storage-pool'
     }
   end
@@ -25,7 +25,7 @@
       should contain_cinder_config('DEFAULT/san_ip').with_value('127.0.0.2')
       should contain_cinder_config('DEFAULT/san_login').with_value('emc')
       should contain_cinder_config('DEFAULT/san_password').with_value('password')
-      should contain_cinder_config('DEFAULT/iscsi_ip_address').with_value('127.0.0.3')
+      should contain_cinder_config('DEFAULT/iscsi_initiators').with_value('{"node1hostname":["10.0.0.1", "10.0.0.2"],"node2hostname":["10.0.0.3"]}')
       should contain_cinder_config('DEFAULT/storage_vnx_pool_name').with_value('emc-storage-pool')
     end
   end
diff --git a/cinder/spec/defines/cinder_backend_emc_vnx_spec.rb b/cinder/spec/defines/cinder_backend_emc_vnx_spec.rb
index e5031bb67..b6b673338 100644
--- a/cinder/spec/defines/cinder_backend_emc_vnx_spec.rb
+++ b/cinder/spec/defines/cinder_backend_emc_vnx_spec.rb
@@ -8,7 +8,7 @@
       :san_ip                => '127.0.0.2',
       :san_login             => 'emc',
       :san_password          => 'password',
-      :iscsi_ip_address      => '127.0.0.3',
+      :iscsi_initiators      => '{"node1hostname":["10.0.0.1", "10.0.0.2"],"node2hostname":["10.0.0.3"]}',
       :storage_vnx_pool_name => 'emc-storage-pool'
     }
   end
@@ -27,7 +27,7 @@
       should contain_cinder_config('emc/san_ip').with_value('127.0.0.2')
       should contain_cinder_config('emc/san_login').with_value('emc')
       should contain_cinder_config('emc/san_password').with_value('password')
-      should contain_cinder_config('emc/iscsi_ip_address').with_value('127.0.0.3')
+      should contain_cinder_config('emc/iscsi_initiators').with_value('{"node1hostname":["10.0.0.1", "10.0.0.2"],"node2hostname":["10.0.0.3"]}')
       should contain_cinder_config('emc/storage_vnx_pool_name').with_value('emc-storage-pool')
     end
   end