diff --git a/manifests/controller.pp b/manifests/controller.pp
index 3142c9a..cfb0b81 100644
--- a/manifests/controller.pp
+++ b/manifests/controller.pp
@@ -17,6 +17,8 @@
 # [keystone_admin_token] Admin token for keystone.
 # [keystone_bind_address] Address that keystone api service should bind to.
 #   Optional. Defaults to '0.0.0.0'.
+# [keystone_token_driver] Driver to use for managing tokens.
+#   Optional.  Defaults to 'keystone.token.backends.sql.Token'
 # [glance_registry_host] Address used by Glance API to find the Glance Registry service.
 #   Optional. Defaults to '0.0.0.0'.
 # [glance_db_password] Glance DB password.
@@ -174,6 +176,7 @@ class openstack::controller (
   $keystone_bind_address   = '0.0.0.0',
   $region                  = 'RegionOne',
   $public_protocol         = 'http',
+  $keystone_token_driver   = 'keystone.token.backends.sql.Token',
   # Glance
   $glance_registry_host    = '0.0.0.0',
   $glance_db_user          = 'glance',
@@ -338,6 +341,7 @@ class openstack::controller (
     admin_tenant              => $keystone_admin_tenant,
     admin_email               => $admin_email,
     admin_password            => $admin_password,
+    token_driver              => $keystone_token_driver,
     public_address            => $public_address,
     public_protocol           => $public_protocol,
     internal_address          => $internal_address_real,
diff --git a/manifests/keystone.pp b/manifests/keystone.pp
index eaa0e61..56eb5b0 100644
--- a/manifests/keystone.pp
+++ b/manifests/keystone.pp
@@ -21,6 +21,8 @@
 # [admin_tenant] Name of keystone admin tenant. Optional. Defaults to  'admin'
 # [verbose] Log verbosely. Optional. Defaults to false.
 # [debug] Log at a debug-level. Optional. Defaults to false.
+# [token_driver] Driver to use for managing tokens.
+#   Optional.  Defaults to 'keystone.token.backends.sql.Token'
 # [bind_host] Address that keystone binds to. Optional. Defaults to  '0.0.0.0'
 # [internal_address] Internal address for keystone. Optional. Defaults to  $public_address
 # [admin_address] Keystone admin address. Optional. Defaults to  $internal_address
@@ -70,6 +72,7 @@ class openstack::keystone (
   $debug                    = false,
   $bind_host                = '0.0.0.0',
   $region                   = 'RegionOne',
+  $token_driver             = 'keystone.token.backends.sql.Token',
   $internal_address         = false,
   $admin_address            = false,
   $glance_public_address    = false,
@@ -197,6 +200,7 @@ class openstack::keystone (
     idle_timeout   => $idle_timeout,
     catalog_type   => 'sql',
     admin_token    => $admin_token,
+    token_driver   => $token_driver,
     enabled        => $enabled,
     sql_connection => $sql_conn,
   }
diff --git a/spec/classes/openstack_controller_spec.rb b/spec/classes/openstack_controller_spec.rb
index 11ffacb..5e67c96 100644
--- a/spec/classes/openstack_controller_spec.rb
+++ b/spec/classes/openstack_controller_spec.rb
@@ -16,6 +16,7 @@ describe 'openstack::controller' do
       :rabbit_virtual_host     => '/',
       :keystone_db_password    => 'keystone_pass',
       :keystone_admin_token    => 'keystone_admin_token',
+      :keystone_token_driver   => 'keystone.token.backends.sql.Token',
       :glance_registry_host    => '0.0.0.0',
       :glance_db_password      => 'glance_pass',
       :glance_user_password    => 'glance_pass',
@@ -196,6 +197,7 @@ describe 'openstack::controller' do
           :catalog_type   => 'sql',
           :enabled        => true,
           :admin_token    => 'keystone_admin_token',
+          :token_driver   => 'keystone.token.backends.sql.Token',
           :sql_connection => "mysql://keystone:keystone_pass@127.0.0.1/keystone"
         )
 
diff --git a/spec/classes/openstack_keystone_spec.rb b/spec/classes/openstack_keystone_spec.rb
index ff7b474..e99768a 100644
--- a/spec/classes/openstack_keystone_spec.rb
+++ b/spec/classes/openstack_keystone_spec.rb
@@ -38,6 +38,7 @@ describe 'openstack::keystone' do
         :catalog_type   => 'sql',
         :admin_token    => 'token',
         :enabled        => true,
+        :token_driver   => 'keystone.token.backends.sql.Token',
         :sql_connection => 'mysql://keystone:pass@127.0.0.1/keystone'
       )
       [ 'glance', 'cinder', 'neutron' ].each do |type|