Add support for TOKEN_TIMEOUT_MARGIN
Change-Id: Ia0ceb69a45680a29e7311da94676d026978c2caa
This commit is contained in:
parent
1ebf203d64
commit
b9780547a9
|
@ -341,6 +341,10 @@
|
||||||
# the user is logged out.
|
# the user is logged out.
|
||||||
# Defaults to 1800.
|
# Defaults to 1800.
|
||||||
#
|
#
|
||||||
|
# [*token_timeout_margin*]
|
||||||
|
# (optional) A time margin in seconds to subtract from the real token's validity.
|
||||||
|
# Defaults to 0.
|
||||||
|
#
|
||||||
# [*timezone*]
|
# [*timezone*]
|
||||||
# (optional) The timezone of the server.
|
# (optional) The timezone of the server.
|
||||||
# Defaults to 'UTC'.
|
# Defaults to 'UTC'.
|
||||||
|
@ -593,6 +597,7 @@ class horizon(
|
||||||
Stdlib::Absolutepath $root_path = "${::horizon::params::static_path}/openstack-dashboard",
|
Stdlib::Absolutepath $root_path = "${::horizon::params::static_path}/openstack-dashboard",
|
||||||
$access_log_format = undef,
|
$access_log_format = undef,
|
||||||
$session_timeout = 1800,
|
$session_timeout = 1800,
|
||||||
|
$token_timeout_margin = 0,
|
||||||
$timezone = 'UTC',
|
$timezone = 'UTC',
|
||||||
Boolean $secure_cookies = false,
|
Boolean $secure_cookies = false,
|
||||||
$django_session_engine = undef,
|
$django_session_engine = undef,
|
||||||
|
|
|
@ -0,0 +1,4 @@
|
||||||
|
---
|
||||||
|
features:
|
||||||
|
- |
|
||||||
|
The new ``horizon::token_timeout_margin`` parameter has been added.
|
|
@ -72,6 +72,8 @@ describe 'horizon' do
|
||||||
'OPENSTACK_KEYSTONE_DEFAULT_ROLE = "member"',
|
'OPENSTACK_KEYSTONE_DEFAULT_ROLE = "member"',
|
||||||
'TIME_ZONE = "UTC"',
|
'TIME_ZONE = "UTC"',
|
||||||
" 'handlers': ['file'],",
|
" 'handlers': ['file'],",
|
||||||
|
'SESSION_TIMEOUT = 1800',
|
||||||
|
'TOKEN_TIMEOUT_MARGIN = 0',
|
||||||
'COMPRESS_OFFLINE = True',
|
'COMPRESS_OFFLINE = True',
|
||||||
"FILE_UPLOAD_TEMP_DIR = '/tmp'",
|
"FILE_UPLOAD_TEMP_DIR = '/tmp'",
|
||||||
])
|
])
|
||||||
|
@ -132,6 +134,7 @@ describe 'horizon' do
|
||||||
:keystone_default_domain => 'domain.tld',
|
:keystone_default_domain => 'domain.tld',
|
||||||
:overview_days_range => 1,
|
:overview_days_range => 1,
|
||||||
:session_timeout => 1800,
|
:session_timeout => 1800,
|
||||||
|
:token_timeout_margin => 60,
|
||||||
:timezone => 'Asia/Shanghai',
|
:timezone => 'Asia/Shanghai',
|
||||||
:available_themes => [
|
:available_themes => [
|
||||||
{ 'name' => 'default', 'label' => 'Default', 'path' => 'themes/default' },
|
{ 'name' => 'default', 'label' => 'Default', 'path' => 'themes/default' },
|
||||||
|
@ -219,6 +222,7 @@ describe 'horizon' do
|
||||||
" 'level': 'DEBUG',",
|
" 'level': 'DEBUG',",
|
||||||
" 'handlers': ['console', 'syslog'],",
|
" 'handlers': ['console', 'syslog'],",
|
||||||
'SESSION_TIMEOUT = 1800',
|
'SESSION_TIMEOUT = 1800',
|
||||||
|
'TOKEN_TIMEOUT_MARGIN = 60',
|
||||||
'COMPRESS_OFFLINE = False',
|
'COMPRESS_OFFLINE = False',
|
||||||
"FILE_UPLOAD_TEMP_DIR = '/var/spool/horizon'",
|
"FILE_UPLOAD_TEMP_DIR = '/var/spool/horizon'",
|
||||||
'OVERVIEW_DAYS_RANGE = 1',
|
'OVERVIEW_DAYS_RANGE = 1',
|
||||||
|
|
|
@ -1056,6 +1056,8 @@ SECURITY_GROUP_RULES = {
|
||||||
|
|
||||||
SESSION_TIMEOUT = <%= @session_timeout %>
|
SESSION_TIMEOUT = <%= @session_timeout %>
|
||||||
|
|
||||||
|
TOKEN_TIMEOUT_MARGIN = <%= @token_timeout_margin %>
|
||||||
|
|
||||||
# The Ubuntu package includes pre-compressed JS and compiled CSS to allow
|
# The Ubuntu package includes pre-compressed JS and compiled CSS to allow
|
||||||
# offline compression by default. To enable online compression, install
|
# offline compression by default. To enable online compression, install
|
||||||
# the python-lesscpy package and disable the following option.
|
# the python-lesscpy package and disable the following option.
|
||||||
|
|
Loading…
Reference in New Issue