diff --git a/manifests/controller.pp b/manifests/controller.pp
index 054731c..e76948e 100644
--- a/manifests/controller.pp
+++ b/manifests/controller.pp
@@ -108,7 +108,15 @@
 #   (Optional) Defaults to false. Required if swift is set to true.
 #
 # [swift_public_address]
-#   The swift address used to populate the keystone service catalog.
+#   The swift public endpoint address used to populate the keystone service catalog.
+#   (optional). Defaults to false.
+#
+# [swift_internal_address]
+#   The swift internal endpoint address used to populate the keystone service catalog.
+#   (optional). Defaults to false.
+#
+# [swift_admin_address]
+#   The swift admin endpoint address used to populate the keystone service catalog.
 #   (optional). Defaults to false.
 #
 # === Examples
@@ -248,6 +256,8 @@ class openstack::controller (
   # swift
   $swift                   = false,
   $swift_public_address    = false,
+  $swift_internal_address  = false,
+  $swift_admin_address     = false,
   $enabled                 = true
 ) {
 
@@ -348,8 +358,8 @@ class openstack::controller (
     swift                     => $swift,
     swift_user_password       => $swift_user_password,
     swift_public_address      => $swift_public_address,
-    swift_internal_address    => $internal_address_real,
-    swift_admin_address       => $admin_address_real,
+    swift_internal_address    => $swift_internal_address,
+    swift_admin_address       => $swift_admin_address,
     enabled                   => $enabled,
     bind_host                 => $keystone_bind_address,
   }
diff --git a/spec/classes/openstack_controller_spec.rb b/spec/classes/openstack_controller_spec.rb
index 3e6a08d..88c40d5 100644
--- a/spec/classes/openstack_controller_spec.rb
+++ b/spec/classes/openstack_controller_spec.rb
@@ -183,9 +183,11 @@ describe 'openstack::controller' do
       it 'should configure default keystone configuration' do
 
         should contain_class('openstack::keystone').with(
-          :swift                => false,
-          :swift_user_password  => false,
-          :swift_public_address => false
+          :swift                  => false,
+          :swift_user_password    => false,
+          :swift_public_address   => false,
+          :swift_internal_address => false,
+          :swift_admin_address    => false
         )
 
         should contain_class('keystone').with(
@@ -228,16 +230,20 @@ describe 'openstack::controller' do
       context 'when configuring swift' do
         before :each do
           params.merge!(
-            :swift                => true,
-            :swift_user_password  => 'foo',
-            :swift_public_address => '10.0.0.2'
+            :swift                  => true,
+            :swift_user_password    => 'foo',
+            :swift_public_address   => '10.0.0.2',
+            :swift_internal_address => '10.0.0.2',
+            :swift_admin_address    => '10.0.0.2'
           )
         end
         it 'should configure swift auth in keystone' do
           should contain_class('openstack::keystone').with(
-            :swift                => true,
-            :swift_user_password  => 'foo',
-            :swift_public_address => '10.0.0.2'
+            :swift                  => true,
+            :swift_user_password    => 'foo',
+            :swift_public_address   => '10.0.0.2',
+            :swift_internal_address => '10.0.0.2',
+            :swift_admin_address    => '10.0.0.2'
           )
         end
       end