diff --git a/deployment/puppet/horizon/manifests/init.pp b/deployment/puppet/horizon/manifests/init.pp
index 8df1fd3111..925a2f2ac5 100644
--- a/deployment/puppet/horizon/manifests/init.pp
+++ b/deployment/puppet/horizon/manifests/init.pp
@@ -1,9 +1,23 @@
 #
 # installs a horizon server
 #
+#
+# - Parameters
+# $cache_server_ip      memcached ip address (or VIP)
+# $cache_server_port    memcached port
+# $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.
+#   Each app is defined in two parts, the display name, and the URI
+# [horizon_app_links]     array as in '[ ["Nagios","http://nagios_addr:port/path"],["Ganglia","http://ganglia_addr"] ]'
+#
 class horizon(
   $cache_server_ip   = '127.0.0.1',
-  $cache_server_port = '11211'
+  $cache_server_port = '11211',
+  $swift = false,
+  $quantum = false,
+  $horizon_app_links = false,
 ) {
 
   include horizon::params
diff --git a/deployment/puppet/horizon/templates/local_settings.py.erb b/deployment/puppet/horizon/templates/local_settings.py.erb
index 9741188fdd..bcee481d69 100644
--- a/deployment/puppet/horizon/templates/local_settings.py.erb
+++ b/deployment/puppet/horizon/templates/local_settings.py.erb
@@ -62,16 +62,22 @@ OPENSTACK_KEYSTONE_BACKEND = {
 # external to the OpenStack environment. The default is 'internalURL'.
 #OPENSTACK_ENDPOINT_TYPE = "publicURL"
 
+<% if swift -%>
+# Include the SWIFT interface extension in Horizon
+SWIFT_ENABLED = True
+<% end -%>
+
 # The number of Swift containers and objects to display on a single page before
 # providing a paging element (a "more" link) to paginate results.
 API_RESULT_LIMIT = 1000
 
-# If you have external monitoring links, eg:
-# EXTERNAL_MONITORING = [
-#     ['Nagios','http://foo.com'],
-#     ['Ganglia','http://bar.com'],
-# ]
+<% if quantum -%>
+#  Include the Quantum interface extensions in Horizon
+QUANTUM_ENABLED = True
+<% end -%>
 
+# If you have external monitoring links, eg:
+EXTERNAL_MONITORING = <% if horizon_app_links %><%= horizon_app_links %>,<% else %>[ ]<% end %>
 LOGGING = {
         'version': 1,
         # When set to True this will disable all logging except