diff --git a/attributes/default.rb b/attributes/default.rb
index 41487f00..e5da885e 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -110,6 +110,7 @@ when "fedora"
     "libvirt_packages" => ["libvirt"],
     "libvirt_service" => "libvirtd",
     "common_packages" => ["openstack-nova"],
+    "iscsi_helper" => "ietadm",
     "package_overrides" => ""
   }
 when "ubuntu"
@@ -137,6 +138,7 @@ when "ubuntu"
     "libvirt_packages" => ["libvirt-bin"],
     "libvirt_service" => "libvirt-bin",
     "common_packages" => ["nova-common"],
+    "iscsi_helper" => "tgtadm",
     "package_overrides" => "-o Dpkg::Options::='--force-confold' -o Dpkg::Options::='--force-confdef'"
   }
 end
diff --git a/recipes/nova-common.rb b/recipes/nova-common.rb
index 38eeb553..db4003b4 100644
--- a/recipes/nova-common.rb
+++ b/recipes/nova-common.rb
@@ -69,6 +69,7 @@ template "/etc/nova/nova.conf" do
     "keystone_service_port" => ks_service_endpoint["port"],
     "glance_api_ipaddress" => glance_endpoint["host"],
     "glance_api_port" => glance_endpoint["port"],
+    "iscsi_helper" => platform_options["iscsi_helper"],
     "virt_type" => node["nova"]["libvirt"]["virt_type"]
   )
 end
diff --git a/templates/default/nova.conf.erb b/templates/default/nova.conf.erb
index 0efdcb46..7c3e43c2 100644
--- a/templates/default/nova.conf.erb
+++ b/templates/default/nova.conf.erb
@@ -66,3 +66,6 @@ ec2_private_dns_show_ip=True
 
 # KEYSTONE
 keystone_ec2_url=http://<%= @keystone_api_ipaddress %>:<%= @keystone_service_port %>/v2.0/ec2tokens
+
+# Volumes
+iscsi_helper=<%= @iscsi_helper %>