diff --git a/manifests/all.pp b/manifests/all.pp
index fa32fb4..0e66ddb 100644
--- a/manifests/all.pp
+++ b/manifests/all.pp
@@ -112,7 +112,6 @@ class openstack::all (
   $horizon                 = true,
   $cache_server_ip         = '127.0.0.1',
   $cache_server_port       = '11211',
-  $swift                   = false,
   $horizon_app_links       = undef,
   # if the cinder management components should be installed
   $cinder                  = true,
@@ -376,8 +375,6 @@ class openstack::all (
       secret_key        => $secret_key,
       cache_server_ip   => $cache_server_ip,
       cache_server_port => $cache_server_port,
-      swift             => $swift,
-      quantum           => $quantum,
       horizon_app_links => $horizon_app_links,
     }
   }
diff --git a/manifests/controller.pp b/manifests/controller.pp
index 287a99f..0cc2a8e 100644
--- a/manifests/controller.pp
+++ b/manifests/controller.pp
@@ -39,7 +39,6 @@
 # [cache_server_ip]     local memcached instance ip
 # [cache_server_port]   local memcached instance port
 # [horizon]             (bool) is horizon installed. Defaults to: true
-# [swift]               (bool) is swift installed
 # [quantum]             (bool) is quantum installed
 #   The next is an array of arrays, that can be used to add call-out links to the dashboard for other apps.
 #   There is no specific requirement for these apps to be for monitoring, that's just the defacto purpose.
@@ -130,7 +129,6 @@ class openstack::controller (
   $cache_server_ip         = '127.0.0.1',
   $cache_server_port       = '11211',
   $horizon_app_links       = undef,
-  $swift                   = false,
   # VNC
   $vnc_enabled             = true,
   $vncproxy_host           = false,
@@ -324,8 +322,6 @@ class openstack::controller (
       secret_key        => $secret_key,
       cache_server_ip   => $cache_server_ip,
       cache_server_port => $cache_server_port,
-      swift             => $swift,
-      quantum           => $quantum,
       horizon_app_links => $horizon_app_links,
     }
   }
diff --git a/manifests/horizon.pp b/manifests/horizon.pp
index 11b1a8a..41cd63d 100644
--- a/manifests/horizon.pp
+++ b/manifests/horizon.pp
@@ -22,14 +22,6 @@
 #    (optional) Port that memcache server listens on.
 #    Defaults to '11211'.
 #
-# [*swift*]
-#   (optional) Whether the swift interface extension should be enabled in Horizon
-#    Defaults to false.
-#
-# [*quantum*]
-#   (optional) Whether the quantum interface extension should be enabled in Horizon
-#    Defaults to false.
-#
 # [*horizon_app_links*]
 #   (optional) External Monitoring links.
 #   Defaults to undef.
@@ -65,8 +57,6 @@ class openstack::horizon (
   $secret_key,
   $cache_server_ip       = '127.0.0.1',
   $cache_server_port     = '11211',
-  $swift                 = false,
-  $quantum               = false,
   $horizon_app_links     = undef,
   $keystone_host         = '127.0.0.1',
   $keystone_scheme       = 'http',
@@ -85,8 +75,6 @@ class openstack::horizon (
     cache_server_ip       => $cache_server_ip,
     cache_server_port     => $cache_server_port,
     secret_key            => $secret_key,
-    swift                 => $swift,
-    quantum               => $quantum,
     horizon_app_links     => $horizon_app_links,
     keystone_host         => $keystone_host,
     keystone_scheme       => $keystone_scheme,
diff --git a/spec/classes/openstack_all_spec.rb b/spec/classes/openstack_all_spec.rb
index d8a62b9..4862bdc 100644
--- a/spec/classes/openstack_all_spec.rb
+++ b/spec/classes/openstack_all_spec.rb
@@ -42,8 +42,6 @@ describe 'openstack::all' do
         :secret_key        => 'secret_key',
         :cache_server_ip   => '127.0.0.1',
         :cache_server_port => '11211',
-        :swift             => false,
-        :quantum           => false,
         :horizon_app_links => false
       )
     end
diff --git a/spec/classes/openstack_controller_spec.rb b/spec/classes/openstack_controller_spec.rb
index a684a6d..c402aa4 100644
--- a/spec/classes/openstack_controller_spec.rb
+++ b/spec/classes/openstack_controller_spec.rb
@@ -403,8 +403,6 @@ describe 'openstack::controller' do
         :secret_key        => 'secret_key',
         :cache_server_ip   => '127.0.0.1',
         :cache_server_port => '11211',
-        :swift             => false,
-        :quantum           => false,
         :horizon_app_links => false
       )
     end
diff --git a/spec/classes/openstack_horizon_spec.rb b/spec/classes/openstack_horizon_spec.rb
index 9859398..e36a4fb 100644
--- a/spec/classes/openstack_horizon_spec.rb
+++ b/spec/classes/openstack_horizon_spec.rb
@@ -30,8 +30,6 @@ describe 'openstack::horizon' do
       :cache_server_ip       => '127.0.0.1',
       :cache_server_port     => '11211',
       :secret_key            => 'super_secret',
-      :swift                 => false,
-      :quantum               => false,
       :horizon_app_links     => false,
       :keystone_host         => '127.0.0.1',
       :keystone_scheme       => 'http',