openstack/watcher-dashboard
Code Issues Proposed changes

Updated from global requirements

Browse Source 
Change-Id: Icb45880ea2e34fd239ca62358058f11f046a3b5f
This commit is contained in:
OpenStack Proposal Bot 2016-08-19 19:54:41 +00:00 committed by David TARDIVEL
parent e1e6f22011
commit a8e73dca8b
2 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
requirements.txt
View File

@ -6,9 +6,9 @@ pbr>=1.6 # Apache-2.0
# Horizon Core Requirements
Django<1.9,>=1.8 # BSD
django-compressor>=2.0 # MIT
django-openstack-auth>=2.3.0 # Apache-2.0
django-openstack-auth>=2.4.0 # Apache-2.0
httplib2>=0.7.5 # MIT
python-keystoneclient!=1.8.0,!=2.1.0,>=1.7.0 # Apache-2.0
python-keystoneclient!=2.1.0,>=2.0.0 # Apache-2.0
pytz>=2013.6 # MIT
# Watcher-specific requirements

44
watcher_dashboard/test/settings.py
View File

@ -19,9 +19,8 @@ from django.utils.translation import pgettext_lazy
from horizon.test.settings import * # noqa
from horizon.utils import secret_key
from openstack_dashboard import exceptions
from openstack_dashboard.static_settings import find_static_files # noqa
from openstack_dashboard.static_settings import get_staticfiles_dirs # noqa
from openstack_dashboard import theme_settings
from openstack_dashboard.utils import settings as settings_utils
DEBUG = True
TEMPLATE_DEBUG = DEBUG
@ -41,6 +40,14 @@ TEMPLATE_DIRS = (
os.path.join(TEST_DIR, 'templates'),
)
STATICFILES_FINDERS = (
'django.contrib.staticfiles.finders.FileSystemFinder',
'horizon.contrib.staticfiles.finders.HorizonStaticFinder',
'compressor.finders.CompressorFinder',
)
COMPRESS_ENABLED = False
TEMPLATE_CONTEXT_PROCESSORS += (
'openstack_dashboard.context_processors.openstack',
)
@ -107,22 +114,31 @@ AVAILABLE_THEMES, DEFAULT_THEME = theme_settings.get_available_themes(
DEFAULT_THEME
)
STATICFILES_DIRS = get_staticfiles_dirs(STATIC_URL) + \
theme_settings.get_theme_static_dirs(
AVAILABLE_THEMES,
THEME_COLLECTION_DIR,
ROOT_PATH)
# Dictionary of currently available angular features
ANGULAR_FEATURES = {
'images_panel': False,
}
# Notice all customizable configurations should be above this line
XSTATIC_MODULES = settings_utils.BASE_XSTATIC_MODULES
# Discover all the directories that contain static files; at the same time
# discover all the xstatic module entry points to embed in our HTML
STATICFILES_DIRS = settings_utils.get_xstatic_dirs(
XSTATIC_MODULES, HORIZON_CONFIG)
STATICFILES_DIRS += theme_settings.get_theme_static_dirs(
AVAILABLE_THEMES, THEME_COLLECTION_DIR, ROOT_PATH)
# populate HORIZON_CONFIG with auto-discovered JavaScript sources, mock files,
# specs files and external templates.
find_static_files(HORIZON_CONFIG, AVAILABLE_THEMES,
THEME_COLLECTION_DIR, ROOT_PATH)
settings_utils.find_static_files(HORIZON_CONFIG, AVAILABLE_THEMES,
THEME_COLLECTION_DIR, ROOT_PATH)
# ############## #
# Load the pluggable dashboard settings
from openstack_dashboard.utils import settings
dashboard_module_names = [
'openstack_dashboard.enabled',
'openstack_dashboard.local.enabled',
@ -134,11 +150,15 @@ dashboard_modules = []
for module_name in dashboard_module_names:
module = importlib.import_module(module_name)
dashboard_modules.append(module)
for submodule in six.itervalues(settings.import_submodules(module)):
for submodule in six.itervalues(settings_utils.import_submodules(module)):
if getattr(submodule, 'DISABLED', None):
delattr(submodule, 'DISABLED')
INSTALLED_APPS = list(INSTALLED_APPS) # Make sure it's mutable
settings.update_dashboards(dashboard_modules, HORIZON_CONFIG, INSTALLED_APPS)
settings_utils.update_dashboards(
dashboard_modules,
HORIZON_CONFIG, INSTALLED_APPS
)
# Set to True to allow users to upload images to glance via Horizon server.
# When enabled, a file form field will appear on the create image form.