Merge "Add auth_token_lifetime to undercloud.conf"

This commit is contained in:
Zuul 2021-02-05 08:45:12 +00:00 committed by Gerrit Code Review
commit 84e01ea021
4 changed files with 16 additions and 0 deletions

View File

@ -0,0 +1,6 @@
---
features:
- |
Adds `auth_token_lifetime` to undercloud.conf with a default of 14400. This
configuration option exposes the keystone token expirataion as a top level
configuration since it may need to be increased to handle larger clouds.

View File

@ -356,6 +356,13 @@ class UndercloudConfig(StandaloneConfig):
help=(_('Ironic network interface implementation to '
'use by default.'))
),
cfg.StrOpt('auth_token_lifetime',
default=14400,
help=(_(
'Authentication token expiration time in '
'seconds. Note reducing this can have impacts on '
'long running undercloud processes.'))
),
]
return self.sort_opts(_base_opts + _opts)

View File

@ -26,6 +26,7 @@ class TestUndercloudConfig(base.TestCase):
def test_get_base_opts(self):
ret = self.config.get_base_opts()
expected = ['additional_architectures',
'auth_token_lifetime',
'certificate_generation_ca',
'clean_nodes',
'cleanup',
@ -81,6 +82,7 @@ class TestUndercloudConfig(base.TestCase):
def test_get_opts(self):
ret = self.config.get_opts()
expected = ['additional_architectures',
'auth_token_lifetime',
'certificate_generation_ca',
'clean_nodes',
'cleanup',

View File

@ -72,6 +72,7 @@ PARAMETER_MAPPING = {
'local_subnet': 'UndercloudCtlplaneLocalSubnet',
'enable_routed_networks': 'UndercloudEnableRoutedNetworks',
'local_interface': 'NeutronPublicInterface',
'auth_token_lifetime': 'TokenExpiration',
}
SUBNET_PARAMETER_MAPPING = {