diff --git a/README.md b/README.md
index fd96db6..3b53e55 100644
--- a/README.md
+++ b/README.md
@@ -69,7 +69,7 @@ Attributes
 * `cinder["volume"]["volume_driver"]` - Driver to use for volume creation
 * `cinder["volume"]["volume_group"]` - Name for the VG that will contain exported volumes
 * `cinder["volume"]["iscsi_helper"]` - ISCSI target user-land tool to use
-* `cinder["pki"]["signing_dir"]` - Defaults to `/tmp/cinder-signing-dir`.  Directory where `auth_token` middleware writes certificate
+* `cinder["netapp"]["enabled"]` - Enable netapp-specific options
 
 Templates
 =====
diff --git a/attributes/default.rb b/attributes/default.rb
index edacd56..559387d 100644
--- a/attributes/default.rb
+++ b/attributes/default.rb
@@ -61,6 +61,13 @@ default["cinder"]["service_tenant_name"] = "service"
 default["cinder"]["service_user"] = "cinder"
 default["cinder"]["service_role"] = "admin"
 
+# Netapp support
+default["cinder"]["netapp"]["enabled"] = false
+default["cinder"]["netapp"]["dfm_login"] = "dfm_login"
+default["cinder"]["netapp"]["dfm_password"] = "dfm_password"
+default["cinder"]["netapp"]["dfm_port"] = "8080"
+default["cinder"]["netapp"]["storage_service"] = "storage_service"
+
 # logging attribute
 default["cinder"]["syslog"]["use"] = false
 default["cinder"]["syslog"]["facility"] = "LOG_LOCAL2"
diff --git a/templates/default/cinder.conf.erb b/templates/default/cinder.conf.erb
index 6495c8a..cf8dbdc 100644
--- a/templates/default/cinder.conf.erb
+++ b/templates/default/cinder.conf.erb
@@ -573,6 +573,34 @@ volume_driver=<%= node["cinder"]["volume"]["volume_driver"] %>
 
 ######## defined in cinder.volume.netapp ########
 
+<% if node["cinder"]["netapp"]["enabled"] = true %>
+netapp_wsdl_url=http://<%= node["cinder"]["netapp"]["dfm_hostname"] %>:<%= node["cinder"]["netapp"]["dfm_port"] %>/dfm.wsdl
+#### (StrOpt) URL of the WSDL file for the DFM server
+
+netapp_login=<%= node["cinder"]["netapp"]["dfm_login"] %>
+#### (StrOpt) User name for the DFM server
+
+netapp_password=<%= node["cinder"]["netapp"]["dfm_password"] %>
+#### (StrOpt) Password for the DFM server
+
+netapp_server_hostname=<%= node["cinder"]["netapp"]["dfm_hostname"] %>
+#### (StrOpt) Hostname for the DFM server
+
+netapp_server_port=<%= node["cinder"]["netapp"]["dfm_port"] %>
+#### (IntOpt) Port number for the DFM server
+
+netapp_storage_service=<%= node["cinder"]["netapp"]["storage_service"] %>
+#### (StrOpt) Storage service to use for provisioning (when
+####          volume_type=None)
+
+# netapp_storage_service_prefix=<None>
+#### (StrOpt) Prefix of storage service name to use for provisioning
+####          (volume_type name will be appended)
+
+# netapp_vfiler=<None>
+#### (StrOpt) Vfiler to use for provisioning
+<% else %>
+
 # netapp_wsdl_url=<None>
 #### (StrOpt) URL of the WSDL file for the DFM server
 
@@ -598,7 +626,7 @@ volume_driver=<%= node["cinder"]["volume"]["volume_driver"] %>
 
 # netapp_vfiler=<None>
 #### (StrOpt) Vfiler to use for provisioning
-
+<% end %>
 
 ######## defined in cinder.volume.netapp_nfs ########