From ac6bc36a5bb5e8b84df3abc12aecee762d338f9a Mon Sep 17 00:00:00 2001 From: Gabriel Hurley Date: Mon, 25 Jun 2012 13:32:46 -0700 Subject: [PATCH] Make TIME_ZONE a local settings with a sane default. Change-Id: Ib441d3ca0e2f0d70eb6fd372e42c363be1090511 --- openstack_dashboard/local/local_settings.py.example | 4 ++++ openstack_dashboard/settings.py | 1 - 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/openstack_dashboard/local/local_settings.py.example b/openstack_dashboard/local/local_settings.py.example index 0f94db528..48cfc425a 100644 --- a/openstack_dashboard/local/local_settings.py.example +++ b/openstack_dashboard/local/local_settings.py.example @@ -71,6 +71,10 @@ OPENSTACK_KEYSTONE_BACKEND = { # providing a paging element (a "more" link) to paginate results. API_RESULT_LIMIT = 1000 +# The timezone of the server. This should correspond with the timezone +# of your entire OpenStack installation, and hopefully be in UTC. +TIME_ZONE = "UTC" + LOGGING = { 'version': 1, # When set to True this will disable all logging except diff --git a/openstack_dashboard/settings.py b/openstack_dashboard/settings.py index ed867b8cf..3467d08b6 100644 --- a/openstack_dashboard/settings.py +++ b/openstack_dashboard/settings.py @@ -126,7 +126,6 @@ SESSION_COOKIE_HTTPONLY = True SESSION_EXPIRE_AT_BROWSER_CLOSE = True SESSION_COOKIE_SECURE = False -TIME_ZONE = None gettext_noop = lambda s: s LANGUAGES = ( ('en', gettext_noop('English')),