Merge branch 'hotfix/helpdesk' into master-2
diff --git a/horizon/files/local_settings/helpdesk_settings.py b/horizon/files/local_settings/helpdesk_settings.py
index 155fdf4..539a123 100644
--- a/horizon/files/local_settings/helpdesk_settings.py
+++ b/horizon/files/local_settings/helpdesk_settings.py
@@ -5,6 +5,11 @@
{%- from "horizon/map.jinja" import server with context %}
{%- set app = salt['pillar.get']('horizon:server:app:'+app_name) %}
+{% include "horizon/files/horizon_settings/_local_settings.py" %}
+{% include "horizon/files/horizon_settings/_horizon_settings.py" %}
+{% include "horizon/files/horizon_settings/_keystone_settings.py" %}
+
+
# OpenStack Dashboard configuration.
HORIZON_CONFIG = {
'dashboards': ({% if app.plugin is defined %}{% for plugin_name, plugin in app.plugin.iteritems() %}{% if plugin.get('dashboard', False) %}'{{ plugin_name }}', {% endif %}{% endfor %}{% endif %}'admin', 'settings'),
@@ -32,6 +37,7 @@
{%- endif %}
{%- endfor %}
'helpdesk_auth',
+ 'horizon_contrib',
'redactor',
'openstack_dashboard',
'django.contrib.contenttypes',
@@ -55,7 +61,3 @@
AUTHENTICATION_BACKENDS = ('helpdesk_auth.backend.HelpdeskBackend',)
AUTHENTICATION_URLS = ['helpdesk_auth.urls']
-
-{% include "horizon/files/horizon_settings/_local_settings.py" %}
-{% include "horizon/files/horizon_settings/_horizon_settings.py" %}
-{% include "horizon/files/horizon_settings/_keystone_settings.py" %}