X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=planetstack%2Fplanetstack%2Fsettings.py;h=f7f151ba89dc09834850559a0a072a765dc61e3e;hb=e42cedcb2caf20b1118db570a9650348958d7590;hp=857198702b4c51d212ffce1f236bd266dcdb2a51;hpb=b1575b67b0e883f5a2b538faa822c1eb041b93c1;p=plstackapi.git diff --git a/planetstack/planetstack/settings.py b/planetstack/planetstack/settings.py index 8571987..f7f151b 100644 --- a/planetstack/planetstack/settings.py +++ b/planetstack/planetstack/settings.py @@ -150,6 +150,8 @@ INSTALLED_APPS = ( 'cassandra', 'kairos', 'nagios', +# 'urlfilter', + 'servcomp', 'syndicate_storage', 'geoposition', ) @@ -217,6 +219,8 @@ SUIT_CONFIG = { # {'label': 'Cassandra', 'icon':'icon-cog', 'app': 'cassandra'}, # {'label': 'KairosDB', 'icon':'icon-cog', 'app': 'kairos'}, # {'label': 'Nagios', 'icon':'icon-cog', 'app': 'nagios'}, +# {'label': 'URL Filter', 'icon': 'icon-cog', 'app': 'urlfilter'}, + {'label': 'Service Comp', 'icon': 'icon-cog', 'app': 'servcomp'}, #{'label': 'Configured Services', 'icon':'icon-cog', 'models': [{'label': 'Content Delivery Network', 'app':'hpc'}]}, # 'sites', @@ -265,5 +269,7 @@ DISABLE_MINIDASHBOARD = getattr(config, "gui_disable_minidashboard", False) ENCRYPTED_FIELDS_KEYDIR = '/opt/planetstack/private_keys' ENCRYPTED_FIELD_MODE = 'ENCRYPT' +STATISTICS_DRIVER = getattr(config, "statistics_driver", "ceilometer") + # prevents warnings on django 1.7 TEST_RUNNER = 'django.test.runner.DiscoverRunner'