Merge "Allow partial override about SshServerOptions" into stable/ussuri

This commit is contained in:
Zuul 2021-04-09 19:58:56 +00:00 committed by Gerrit Code Review
commit cf52d2e6c0
2 changed files with 15 additions and 1 deletions

View File

@ -60,6 +60,11 @@ parameters:
Subsystem: 'sftp /usr/libexec/openssh/sftp-server' Subsystem: 'sftp /usr/libexec/openssh/sftp-server'
description: Mapping of sshd_config values description: Mapping of sshd_config values
type: json type: json
SshServerOptionsOverrides:
default: {}
description: Mapping of sshd_config values to override definitions in
SshServerOptions
type: json
PasswordAuthentication: PasswordAuthentication:
default: 'no' default: 'no'
description: Whether or not disable password authentication description: Whether or not disable password authentication
@ -86,7 +91,10 @@ outputs:
config_settings: config_settings:
tripleo::profile::base::sshd::bannertext: {get_param: BannerText} tripleo::profile::base::sshd::bannertext: {get_param: BannerText}
tripleo::profile::base::sshd::motd: {get_param: MessageOfTheDay} tripleo::profile::base::sshd::motd: {get_param: MessageOfTheDay}
tripleo::profile::base::sshd::options: {get_param: SshServerOptions} tripleo::profile::base::sshd::options:
map_merge:
- {get_param: SshServerOptions}
- {get_param: SshServerOptionsOverrides}
tripleo::profile::base::sshd::password_authentication: {get_param: PasswordAuthentication} tripleo::profile::base::sshd::password_authentication: {get_param: PasswordAuthentication}
step_config: | step_config: |
include tripleo::profile::base::sshd include tripleo::profile::base::sshd

View File

@ -0,0 +1,6 @@
---
features:
- |
The new ``SshServerOptionsOverrides`` parameter has been added. This
parameter can be used to override a part of sshd_config, which is defined
by the ``SshServerOptions``.