test(pillar): add `ssh-rsa` Kitchen workaround on Gentoo [skip ci]
This commit is contained in:
parent
4ba57d3f92
commit
d65ea55d94
|
@ -180,6 +180,7 @@ values:
|
||||||
AcceptEnv: LANG LC_*
|
AcceptEnv: LANG LC_*
|
||||||
ChallengeResponseAuthentication: 'no'
|
ChallengeResponseAuthentication: 'no'
|
||||||
PrintMotd: 'no'
|
PrintMotd: 'no'
|
||||||
|
PubkeyAcceptedAlgorithms: "+ssh-rsa"
|
||||||
Subsystem: sftp /usr/lib/openssh/sftp-server
|
Subsystem: sftp /usr/lib/openssh/sftp-server
|
||||||
UsePAM: 'yes'
|
UsePAM: 'yes'
|
||||||
X11Forwarding: 'yes'
|
X11Forwarding: 'yes'
|
||||||
|
|
|
@ -180,6 +180,7 @@ values:
|
||||||
AcceptEnv: LANG LC_*
|
AcceptEnv: LANG LC_*
|
||||||
ChallengeResponseAuthentication: 'no'
|
ChallengeResponseAuthentication: 'no'
|
||||||
PrintMotd: 'no'
|
PrintMotd: 'no'
|
||||||
|
PubkeyAcceptedAlgorithms: "+ssh-rsa"
|
||||||
Subsystem: sftp /usr/lib/openssh/sftp-server
|
Subsystem: sftp /usr/lib/openssh/sftp-server
|
||||||
UsePAM: 'yes'
|
UsePAM: 'yes'
|
||||||
X11Forwarding: 'yes'
|
X11Forwarding: 'yes'
|
||||||
|
|
|
@ -27,7 +27,7 @@ sshd_config:
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
{#- Need this on various platforms to avoid the `kitchen verify` failure as mentioned above; see: #}
|
{#- Need this on various platforms to avoid the `kitchen verify` failure as mentioned above; see: #}
|
||||||
{#- * https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/-/commit/cb6781a2bba9 #}
|
{#- * https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/-/commit/cb6781a2bba9 #}
|
||||||
{%- if grains.os in ["Arch", "OpenBSD"] or grains.get("oscodename", "") in ["openSUSE Tumbleweed"] %}
|
{%- if grains.os in ["Arch", "OpenBSD", "Gentoo"] or grains.get("oscodename", "") in ["openSUSE Tumbleweed"] %}
|
||||||
PubkeyAcceptedAlgorithms: "+ssh-rsa"
|
PubkeyAcceptedAlgorithms: "+ssh-rsa"
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue