diff --git a/manifests/controller.pp b/manifests/controller.pp
index d44a38a..d87d012 100644
--- a/manifests/controller.pp
+++ b/manifests/controller.pp
@@ -16,6 +16,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'.
+# [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.
 # [glance_user_password] Glance service user password.
 # [nova_db_password] Nova DB password.
@@ -162,6 +164,7 @@ class openstack::controller (
   $keystone_bind_address   = '0.0.0.0',
   $region                  = 'RegionOne',
   # Glance
+  $glance_registry_host    = '0.0.0.0',
   $glance_db_user          = 'glance',
   $glance_db_dbname        = 'glance',
   $glance_api_servers      = undef,
@@ -339,6 +342,7 @@ class openstack::controller (
     db_host          => $db_host,
     sql_idle_timeout => $sql_idle_timeout,
     keystone_host    => $keystone_host,
+    registry_host    => $glance_registry_host,
     db_user          => $glance_db_user,
     db_name          => $glance_db_dbname,
     db_password      => $glance_db_password,
diff --git a/spec/classes/openstack_controller_spec.rb b/spec/classes/openstack_controller_spec.rb
index b0c9e60..fc3cdfc 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',
+      :glance_registry_host    => '0.0.0.0',
       :glance_db_password      => 'glance_pass',
       :glance_user_password    => 'glance_pass',
       :nova_bind_address       => '0.0.0.0',
@@ -276,6 +277,7 @@ describe 'openstack::controller' do
           :keystone_tenant   => 'services',
           :keystone_user     => 'glance',
           :keystone_password => 'glance_pass',
+          :registry_host     => '0.0.0.0',
           :sql_connection    => 'mysql://glance:glance_pass@127.0.0.1/glance',
           :enabled           => true
         )
@@ -318,6 +320,7 @@ describe 'openstack::controller' do
         default_params.merge(
           :verbose               => false,
           :debug                 => false,
+          :glance_registry_host  => '127.0.0.2',
           :glance_user_password  => 'glance_pass2',
           :glance_db_password    => 'glance_pass3',
           :db_host               => '127.0.0.2',
@@ -332,6 +335,7 @@ describe 'openstack::controller' do
         should contain_class('glance::api').with(
           :verbose           => false,
           :debug             => false,
+          :registry_host     => '127.0.0.2',
           :auth_type         => 'keystone',
           :auth_host         => '127.0.0.1',
           :auth_port         => '35357',