openstack/cloudkitty-dashboard
Code Issues Proposed changes

Fixed enabled files for Liberty release

Browse Source 
We used to have only one enabled file and tricked horizon in loading all
others enabled files as if it was a dashboard. This trick is not working
anymore.

Closes-Bug: #1507087
Change-Id: I7b075ab66d623e28efb174191ad0ebd359ec06a2
This commit is contained in:
Stéphane Albert 2015-10-19 12:21:12 +02:00
parent 53b4cc13f8
commit c715a1b3c1
3 changed files with 7 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cloudkittydashboard/_90_enable_ck.py
View File

@ -1,29 +0,0 @@
# Copyright 2015 Objectif Libre
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
from openstack_dashboard.utils import settings
import cloudkittydashboard.enabled
ADD_INSTALLED_APPS = ['cloudkittydashboard']
UPDATE_HORIZON_CONFIG = {}
DASHBOARD = ''
settings.update_dashboards(
(cloudkittydashboard.enabled,),
UPDATE_HORIZON_CONFIG,
ADD_INSTALLED_APPS
)

2
cloudkittydashboard/enabled/_11_admin_hashmap_panel.py
View File

@ -12,6 +12,8 @@
# License for the specific language governing permissions and limitations
# under the License.
ADD_INSTALLED_APPS = ['cloudkittydashboard']
PANEL_GROUP = 'rating'
PANEL_DASHBOARD = 'admin'
PANEL = 'hashmap'

8
contrib/cloudkitty-dashboard.spec.in
View File

@ -36,16 +36,18 @@ rm -rf {test-,}requirements.txt tools/{pip,test}-requires
%install
%{__python} setup.py install -O1 --skip-build --root=%{buildroot}
mkdir -p %{buildroot}/usr/share/openstack-dashboard/openstack_dashboard/enabled/
ln -s %{python_sitelib}/cloudkittydashboard/_90_enable_ck.py \
%{buildroot}/usr/share/openstack-dashboard/openstack_dashboard/enabled/_90_enable_ck.py
ln -s %{python_sitelib}/cloudkittydashboard/enabled/_[0-9]*.py \
%{buildroot}/usr/share/openstack-dashboard/openstack_dashboard/enabled/
%files
%{python_sitelib}/*
/usr/share/openstack-dashboard/openstack_dashboard/enabled/_90_enable_ck.py
/usr/share/openstack-dashboard/openstack_dashboard/enabled/*
%description
OpenStack Rating-as-a-Service - Dashboard
%changelog
* Mon Oct 19 2015 Stéphane Albert <stephane.albert@objectif-libre.com> - @VERSION@
- Updated with new enabled files
* Wed May 20 2015 Gauvain Pocentek <gauvain.pocentek@objectif-libre.com> - @VERSION@
- Initial release