From ec707b51d7dac63b52bbae4be5e39a3df6994e79 Mon Sep 17 00:00:00 2001 From: Thomas Goirand Date: Thu, 18 Feb 2016 15:59:30 +0000 Subject: [PATCH] Added patch: 0100-add-openstack_auth-in-INSTALLED_APPS.patch Rewritten-From: e019b0eaa8c65ecaecdbb621c48f4b42788a6394 --- trusty/debian/changelog | 1 + ...add-openstack_auth-in-INSTALLED_APPS.patch | 17 ++++++++ ...methods_to_check_for_disabled_panels.patch | 39 +++++++++---------- trusty/debian/patches/series | 1 + 4 files changed, 37 insertions(+), 21 deletions(-) create mode 100644 trusty/debian/patches/0100-add-openstack_auth-in-INSTALLED_APPS.patch diff --git a/trusty/debian/changelog b/trusty/debian/changelog index b17f24d..bf71d35 100644 --- a/trusty/debian/changelog +++ b/trusty/debian/changelog @@ -3,6 +3,7 @@ horizon (2:9.0.0~b2+2016.02.18.git.cda9604792-1) experimental; urgency=medium * New upstream release, based on commit cda9604792. * Fixed (build-)depends for this release. * Added patch: Provide_2_simple_methods_to_check_for_disabled_panels.patch + * Added patch: 0100-add-openstack_auth-in-INSTALLED_APPS.patch -- Thomas Goirand Wed, 09 Dec 2015 11:37:40 +0100 diff --git a/trusty/debian/patches/0100-add-openstack_auth-in-INSTALLED_APPS.patch b/trusty/debian/patches/0100-add-openstack_auth-in-INSTALLED_APPS.patch new file mode 100644 index 0000000..025de34 --- /dev/null +++ b/trusty/debian/patches/0100-add-openstack_auth-in-INSTALLED_APPS.patch @@ -0,0 +1,17 @@ +Description: Add openstack_auth in INSTALLED_APPS +Author: Thomas Goirand +Forwarded: no +Last-Update: 2016-01-11 + +--- horizon-9.0.0~b2+2016.02.18.git.cda9604792.orig/horizon/test/settings.py ++++ horizon-9.0.0~b2+2016.02.18.git.cda9604792/horizon/test/settings.py +@@ -59,7 +59,8 @@ INSTALLED_APPS = ( + 'horizon', + 'horizon.test', + 'horizon.test.test_dashboards.cats', +- 'horizon.test.test_dashboards.dogs' ++ 'horizon.test.test_dashboards.dogs', ++ 'openstack_auth' + ) + + MIDDLEWARE_CLASSES = ( diff --git a/trusty/debian/patches/Provide_2_simple_methods_to_check_for_disabled_panels.patch b/trusty/debian/patches/Provide_2_simple_methods_to_check_for_disabled_panels.patch index e6c806e..83f62de 100644 --- a/trusty/debian/patches/Provide_2_simple_methods_to_check_for_disabled_panels.patch +++ b/trusty/debian/patches/Provide_2_simple_methods_to_check_for_disabled_panels.patch @@ -16,10 +16,10 @@ Closes-Bug: #1541489 openstack_dashboard/utils/settings.py | 11 +++++++++++ 3 files changed, 28 insertions(+) -diff --git a/openstack_dashboard/dashboards/admin/images/tests.py b/openstack_dashboard/dashboards/admin/images/tests.py -index d4298fb..619dc6c 100644 ---- a/openstack_dashboard/dashboards/admin/images/tests.py -+++ b/openstack_dashboard/dashboards/admin/images/tests.py +Index: horizon/openstack_dashboard/dashboards/admin/images/tests.py +=================================================================== +--- horizon.orig/openstack_dashboard/dashboards/admin/images/tests.py ++++ horizon/openstack_dashboard/dashboards/admin/images/tests.py @@ -16,6 +16,7 @@ from django.conf import settings from django.core.urlresolvers import reverse from django import http @@ -28,7 +28,7 @@ index d4298fb..619dc6c 100644 from mox3.mox import IsA # noqa -@@ -25,6 +26,8 @@ from openstack_dashboard.test import helpers as test +@@ -25,6 +26,8 @@ from openstack_dashboard.test import hel from openstack_dashboard.dashboards.admin.images import tables @@ -37,7 +37,7 @@ index d4298fb..619dc6c 100644 class ImageCreateViewTest(test.BaseAdminViewTests): @test.create_stubs({api.glance: ('image_list_detailed',)}) def test_admin_image_create_view_uses_admin_template(self): -@@ -42,6 +45,8 @@ class ImageCreateViewTest(test.BaseAdminViewTests): +@@ -42,6 +45,8 @@ class ImageCreateViewTest(test.BaseAdmin self.assertTemplateUsed(res, 'admin/images/create.html') @@ -46,11 +46,11 @@ index d4298fb..619dc6c 100644 class ImagesViewTest(test.BaseAdminViewTests): @test.create_stubs({api.glance: ('image_list_detailed',), api.keystone: ('tenant_list',)}) -diff --git a/openstack_dashboard/test/helpers.py b/openstack_dashboard/test/helpers.py -index 5dfa295..7c8a7fb 100644 ---- a/openstack_dashboard/test/helpers.py -+++ b/openstack_dashboard/test/helpers.py -@@ -631,3 +631,15 @@ class update_settings(django_test_utils.override_settings): +Index: horizon/openstack_dashboard/test/helpers.py +=================================================================== +--- horizon.orig/openstack_dashboard/test/helpers.py ++++ horizon/openstack_dashboard/test/helpers.py +@@ -632,3 +632,15 @@ class update_settings(django_test_utils. copied.update(new_value) kwargs[key] = copied super(update_settings, self).__init__(**kwargs) @@ -66,11 +66,11 @@ index 5dfa295..7c8a7fb 100644 + panel in settings.HORIZON_CONFIG['disabled_panels'].get(dashboard) + ) + return False -diff --git a/openstack_dashboard/utils/settings.py b/openstack_dashboard/utils/settings.py -index 6a6d16d..894f833 100644 ---- a/openstack_dashboard/utils/settings.py -+++ b/openstack_dashboard/utils/settings.py -@@ -101,6 +101,7 @@ def update_dashboards(modules, horizon_config, installed_apps): +Index: horizon/openstack_dashboard/utils/settings.py +=================================================================== +--- horizon.orig/openstack_dashboard/utils/settings.py ++++ horizon/openstack_dashboard/utils/settings.py +@@ -100,6 +100,7 @@ def update_dashboards(modules, horizon_c enabled_dashboards = [] disabled_dashboards = [] @@ -78,7 +78,7 @@ index 6a6d16d..894f833 100644 exceptions = horizon_config.get('exceptions', {}) apps = [] angular_modules = [] -@@ -110,7 +111,15 @@ def update_dashboards(modules, horizon_config, installed_apps): +@@ -109,7 +110,15 @@ def update_dashboards(modules, horizon_c panel_customization = [] update_horizon_config = {} for key, config in import_dashboard_config(modules): @@ -94,7 +94,7 @@ index 6a6d16d..894f833 100644 if config.get('DASHBOARD'): disabled_dashboards.append(config.get('DASHBOARD')) continue -@@ -154,6 +163,8 @@ def update_dashboards(modules, horizon_config, installed_apps): +@@ -153,6 +162,8 @@ def update_dashboards(modules, horizon_c horizon_config['panel_customization'] = panel_customization horizon_config['dashboards'] = tuple(dashboards) @@ -103,6 +103,3 @@ index 6a6d16d..894f833 100644 horizon_config.setdefault('exceptions', {}).update(exceptions) horizon_config.update(update_horizon_config) horizon_config.setdefault('angular_modules', []).extend(angular_modules) --- -1.9.1 - diff --git a/trusty/debian/patches/series b/trusty/debian/patches/series index b0ff939..f931b83 100644 --- a/trusty/debian/patches/series +++ b/trusty/debian/patches/series @@ -3,3 +3,4 @@ fix-dashboard-manage.patch fixed-horizon-MANIFEST.in.patch #enable_identity_users_panel.patch Provide_2_simple_methods_to_check_for_disabled_panels.patch +0100-add-openstack_auth-in-INSTALLED_APPS.patch -- 2.45.2