commit 24399e1d290c43414dcb20311cc75bc1c457a9fd
author Adam Tengler <a.tengler@tcpcloud.eu> Sat Oct 24 23:08:08 2015 +0200
committer Adam Tengler <a.tengler@tcpcloud.eu> Sat Oct 24 23:08:08 2015 +0200
tree 804fc2719d95644c3afeea850335efae0a3bf5fc
parent 4edd9de1dc25d969ea601a5a272704de8bfda8b7

Added Liberty support

horizon/files/local_settings/liberty_settings.py

diff --git a/horizon/files/local_settings/liberty_settings.py b/horizon/files/local_settings/liberty_settings.py
index e65d7d7..ee616b8 100644
--- a/horizon/files/local_settings/liberty_settings.py
+++ b/horizon/files/local_settings/liberty_settings.py
@@ -30,9 +30,9 @@
 }
 {%- if app.theme is defined or app.plugin.horizon_theme is defined %}
 {%- if app.theme is defined %}
-CUSTOM_THEME_PATH = 'static/themes/{{ app.theme }}'
+CUSTOM_THEME_PATH = 'themes/{{ app.theme }}'
 {%- elif app.plugin.horizon_theme.theme_name is defined %}
-CUSTOM_THEME_PATH = 'static/themes/{{ app.plugin.horizon_theme.theme_name }}'
+CUSTOM_THEME_PATH = 'themes/{{ app.plugin.horizon_theme.theme_name }}'
 {%- endif %}
 {%- endif %}
 

horizon/files/wsgi.py

diff --git a/horizon/files/wsgi.py b/horizon/files/wsgi.py
index 0f37851..88277bf 100644
--- a/horizon/files/wsgi.py
+++ b/horizon/files/wsgi.py
@@ -27,6 +27,15 @@
 
 os.environ['DJANGO_SETTINGS_MODULE'] = '{{ app.get('dashboard', 'openstack') }}_dashboard.settings'
 
-import django.core.handlers.wsgi
+import django
+if django.VERSION < (1, 6):
+    from django.core.handlers.wsgi import WSGIHandler
 
-application = django.core.handlers.wsgi.WSGIHandler()
+    application = WSGIHandler()
+else:
+    # From 1.4 wsgi support was improved and since 1.7 old style WSGI script
+    # causes AppRegistryNotReady exception
+    # https://docs.djangoproject.com/en/dev/releases/1.7/#wsgi-scripts
+    from django.core.wsgi import get_wsgi_application
+
+    application = get_wsgi_application()

horizon/server/multi/site.sls

diff --git a/horizon/server/multi/site.sls b/horizon/server/multi/site.sls
index f4463be..f47d6f2 100644
--- a/horizon/server/multi/site.sls
+++ b/horizon/server/multi/site.sls
@@ -264,7 +264,7 @@
 
 {%- endif %}
 
-{%- if plugin_name == "horizon_theme" and app.get("version", "juno") in ["kilo", 'helpdesk', 'liberty'] %}
+{%- if plugin_name == "horizon_theme" and app.get("version", "juno") in ["kilo", 'helpdesk'] %}
 
 /srv/horizon/sites/{{ app_name }}/local/lib/python2.7/site-packages/openstack_dashboard/dashboards/theme:
   file.symlink:
@@ -282,6 +282,24 @@
   - require:
     - git: {{ app_name }}_{{ app.source.address }}
 
+{%- elif plugin_name == "horizon_theme" and app.get("version", "liberty") in ['liberty'] %}
+
+/srv/horizon/sites/{{ app_name }}/local/lib/python2.7/site-packages/openstack_dashboard/dashboards/theme:
+  file.symlink:
+  - target: /srv/horizon/sites/{{ app_name }}/plugins/{{ plugin_name }}/horizon_theme/dashboards/theme
+  - user: root
+  - group: root
+  - require:
+    - git: {{ app_name }}_{{ app.source.address }}
+
+/srv/horizon/sites/{{ app_name }}/local/lib/python2.7/site-packages/openstack_dashboard/themes/{{ plugin.theme_name }}:
+  file.symlink:
+  - target: /srv/horizon/sites/{{ app_name }}/plugins/{{ plugin_name }}/horizon_theme/static/{{ plugin.theme_name }}
+  - user: root
+  - group: root
+  - require:
+    - git: {{ app_name }}_{{ app.source.address }}
+
 {%- endif %}
 
 {%- endfor %}