Browse Source

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

changes/72/753372/3
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
cf52d2e6c0
2 changed files with 15 additions and 1 deletions
  1. +9
    -1
      deployment/sshd/sshd-baremetal-puppet.yaml
  2. +6
    -0
      releasenotes/notes/ssh-server-options-overrides-f677913bfd65efe1.yaml

+ 9
- 1
deployment/sshd/sshd-baremetal-puppet.yaml View File

@ -60,6 +60,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
@ -86,7 +91,10 @@ outputs:
config_settings:
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}
step_config: |
include tripleo::profile::base::sshd

+ 6
- 0
releasenotes/notes/ssh-server-options-overrides-f677913bfd65efe1.yaml 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``.

Loading…
Cancel
Save