From ba3684952eac229a57847feb6019af00a365edc9 Mon Sep 17 00:00:00 2001 From: Roman Vyalov Date: Mon, 16 Dec 2013 14:27:13 +0400 Subject: [PATCH] Add patch mos-disable-metering.patch;RPM; OSCI-973 Change-Id: Ib49bab6908923977bc979f81bfa0223d5a90f99b --- rpm/SOURCES/mos-disable-metering.patch | 13 +++++++++++++ rpm/SPECS/python-django-horizon.spec | 3 +++ 2 files changed, 16 insertions(+) create mode 100644 rpm/SOURCES/mos-disable-metering.patch diff --git a/rpm/SOURCES/mos-disable-metering.patch b/rpm/SOURCES/mos-disable-metering.patch new file mode 100644 index 0000000..84b68e9 --- /dev/null +++ b/rpm/SOURCES/mos-disable-metering.patch @@ -0,0 +1,13 @@ +diff --git a/openstack_dashboard/dashboards/admin/dashboard.py b/openstack_dashboard/dashboards/admin/dashboard.py +index bdfc6ef..cf01ca1 100644 +--- a/openstack_dashboard/dashboards/admin/dashboard.py ++++ b/openstack_dashboard/dashboards/admin/dashboard.py +@@ -22,7 +22,7 @@ import horizon + class SystemPanels(horizon.PanelGroup): + slug = "admin" + name = _("System Panel") +- panels = ('overview', 'metering', 'hypervisors', 'instances', 'volumes', ++ panels = ('overview', 'hypervisors', 'instances', 'volumes', + 'flavors', 'images', 'networks', 'routers', 'defaults', 'info') + + diff --git a/rpm/SPECS/python-django-horizon.spec b/rpm/SPECS/python-django-horizon.spec index ef51280..162893a 100644 --- a/rpm/SPECS/python-django-horizon.spec +++ b/rpm/SPECS/python-django-horizon.spec @@ -32,6 +32,8 @@ Patch0007: 0007-move-SECRET_KEY-secret_key_store-to-tmp.patch Patch0008: 0008-fix-up-issues-with-customization.patch Patch0009: 0009-do-not-truncate-the-logo-related-rhbz-877138.patch Patch0010: 0010-move-SECRET_KEYSTORE-to-var-lib-openstack-dashboard.patch +#mirantis OpenStack patch +Patch0100: mos-disable-metering.patch @@ -165,6 +167,7 @@ Customization module for OpenStack Dashboard to provide a branded logo. %patch0008 -p1 %patch0009 -p1 %patch0010 -p1 +%patch0100 -p1 # remove unnecessary .po files find . -name "django*.po" -exec rm -f '{}' \; -- 2.45.2