diff --git a/manifests/network/neutron.pp b/manifests/network/neutron.pp
index 344d500b7..9c72ae74e 100644
--- a/manifests/network/neutron.pp
+++ b/manifests/network/neutron.pp
@@ -10,7 +10,7 @@
 #
 # [*neutron_auth_type*]
 #   Name of the auth type to load (string value)
-#   Defaults to 'v3password'
+#   Defaults to 'password'
 #
 # [*neutron_url*]
 #   (optional) URL for connecting to the Neutron networking service.
@@ -128,7 +128,7 @@
 #
 class nova::network::neutron (
   $neutron_password                = false,
-  $neutron_auth_type               = 'v3password',
+  $neutron_auth_type               = 'password',
   $neutron_project_name            = 'services',
   $neutron_project_domain_name     = 'Default',
   $neutron_username                = 'neutron',
diff --git a/spec/classes/nova_network_neutron_spec.rb b/spec/classes/nova_network_neutron_spec.rb
index 5a7dec33c..9ee7a67c4 100644
--- a/spec/classes/nova_network_neutron_spec.rb
+++ b/spec/classes/nova_network_neutron_spec.rb
@@ -3,7 +3,7 @@ require 'spec_helper'
 describe 'nova::network::neutron' do
 
   let :default_params do
-    { :neutron_auth_type               => 'v3password',
+    { :neutron_auth_type               => 'password',
       :neutron_url                     => 'http://127.0.0.1:9696',
       :neutron_url_timeout             => '30',
       :neutron_project_name            => 'services',