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

This commit is contained in:
Zuul 2022-05-26 03:42:26 +00:00 committed by Gerrit Code Review
commit abe9497da5
2 changed files with 15 additions and 2 deletions

View File

@ -61,6 +61,11 @@ parameters:
Subsystem: 'sftp /usr/libexec/openssh/sftp-server'
description: Mapping of sshd_config values
type: json
SshServerOptionsOverrides:
default: {}
description: Mapping of sshd_config values to override definitions in
SshServerOptions
type: json
PasswordAuthentication:
default: 'no'
description: Whether or not disable password authentication
@ -79,7 +84,10 @@ outputs:
map_merge:
- tripleo::profile::base::sshd::bannertext: {get_param: BannerText}
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}
- if:
- {get_param: SshFirewallAllowAll}
@ -93,6 +101,5 @@ outputs:
dport: 22
extras:
ensure: 'absent'
step_config: |
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``.