diff --git a/manifests/controller.pp b/manifests/controller.pp
index f420cf3..ecd6f08 100644
--- a/manifests/controller.pp
+++ b/manifests/controller.pp
@@ -443,6 +443,8 @@ class openstack::controller (
     rabbit_virtual_host     => $rabbit_virtual_host,
     # Glance
     glance_api_servers      => $glance_api_servers,
+    # Keystone
+    keystone_host           => $keystone_host,
     # VNC
     vnc_enabled             => $vnc_enabled,
     vncproxy_host           => $vncproxy_host_real,
@@ -560,6 +562,7 @@ class openstack::controller (
       cache_server_ip   => $cache_server_ip,
       cache_server_port => $cache_server_port,
       horizon_app_links => $horizon_app_links,
+      keystone_host     => $keystone_host,
     }
   }
 
diff --git a/spec/classes/openstack_controller_spec.rb b/spec/classes/openstack_controller_spec.rb
index ee1a3d2..2011e37 100644
--- a/spec/classes/openstack_controller_spec.rb
+++ b/spec/classes/openstack_controller_spec.rb
@@ -17,6 +17,7 @@ describe 'openstack::controller' do
       :keystone_db_password    => 'keystone_pass',
       :keystone_admin_token    => 'keystone_admin_token',
       :keystone_token_driver   => 'keystone.token.backends.kvs.Token',
+      :keystone_host           => '127.0.0.1',
       :glance_registry_host    => '0.0.0.0',
       :glance_db_password      => 'glance_pass',
       :glance_user_password    => 'glance_pass',
@@ -473,6 +474,7 @@ describe 'openstack::controller' do
           :admin_user        => 'nova',
           :admin_password    => 'nova_pass',
           :enabled_apis      => 'ec2,osapi_compute,metadata',
+          :auth_host         => '127.0.0.1',
           :api_bind_address  => '0.0.0.0'
         )
         should contain_class('nova::cert').with(:enabled => true)
@@ -528,7 +530,8 @@ describe 'openstack::controller' do
         :secret_key        => 'secret_key',
         :cache_server_ip   => '127.0.0.1',
         :cache_server_port => '11211',
-        :horizon_app_links => false
+        :horizon_app_links => false,
+        :keystone_host     => '127.0.0.1'
       )
     end