From 09ac52757c363f496097225c00db34b98697c326 Mon Sep 17 00:00:00 2001 From: Maksym Yatsenko Date: Fri, 30 Jan 2015 18:46:57 +0200 Subject: [PATCH] Update "fix-dashboard-django-wsgi.patch" after merging branch 'stable/juno' into openstack-ci/fuel-6.1/2014.2 Change-Id: Id906224475d24ecab36034fb0f3a1d8bb2b27270 --- .../patches/fix-dashboard-django-wsgi.patch | 23 +++++++++++++++---- debian/patches/series | 2 +- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/debian/patches/fix-dashboard-django-wsgi.patch b/debian/patches/fix-dashboard-django-wsgi.patch index d27489d..028d302 100644 --- a/debian/patches/fix-dashboard-django-wsgi.patch +++ b/debian/patches/fix-dashboard-django-wsgi.patch @@ -1,7 +1,17 @@ -diff -Naurp horizon-2014.2.b2.orig/openstack_dashboard/wsgi/django.wsgi horizon-2014.2.b2/openstack_dashboard/wsgi/django.wsgi ---- horizon-2014.2.b2.orig/openstack_dashboard/wsgi/django.wsgi 2014-07-23 15:25:01.000000000 -0400 -+++ horizon-2014.2.b2/openstack_dashboard/wsgi/django.wsgi 2014-07-25 11:19:00.825608706 -0400 -@@ -9,6 +9,8 @@ sys.path.insert(0, os.path.join(os.path. +From a0e71f08e46805a076d4f5cde7cb39ab64d82be3 Mon Sep 17 00:00:00 2001 +From: Maksym Yatsenko +Date: Fri, 30 Jan 2015 18:19:22 +0200 +Subject: [PATCH] fix-dashboard-django-wsgi + +--- + openstack_dashboard/wsgi/django.wsgi | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/openstack_dashboard/wsgi/django.wsgi b/openstack_dashboard/wsgi/django.wsgi +index 1be0e06..05c8631 100644 +--- a/openstack_dashboard/wsgi/django.wsgi ++++ b/openstack_dashboard/wsgi/django.wsgi +@@ -9,6 +9,8 @@ sys.path.insert(0, os.path.join(os.path.dirname(os.path.realpath(__file__)), '.. os.environ['DJANGO_SETTINGS_MODULE'] = 'openstack_dashboard.settings' sys.stdout = sys.stderr @@ -9,4 +19,7 @@ diff -Naurp horizon-2014.2.b2.orig/openstack_dashboard/wsgi/django.wsgi horizon- + DEBUG = False - application = django.core.handlers.wsgi.WSGIHandler() + application = get_wsgi_application() +-- +1.9.1 + diff --git a/debian/patches/series b/debian/patches/series index ab731c6..42b36b8 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,4 @@ -#fix-dashboard-django-wsgi.patch +fix-dashboard-django-wsgi.patch fix-dashboard-manage.patch # Disabled during Grizzly dev. cycle -- 2.45.2