From d65ea55d94d1cd314412daa6388eda080ab70725 Mon Sep 17 00:00:00 2001 From: Imran Iqbal Date: Wed, 5 Jan 2022 06:19:22 +0000 Subject: [PATCH] test(pillar): add `ssh-rsa` Kitchen workaround on Gentoo [skip ci] --- test/integration/default/files/_mapdata/gentoo-2-sysd.yaml | 1 + test/integration/default/files/_mapdata/gentoo-2-sysv.yaml | 1 + test/salt/pillar/default.sls | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml index 9370260..470df8c 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysd.yaml @@ -180,6 +180,7 @@ values: AcceptEnv: LANG LC_* ChallengeResponseAuthentication: 'no' PrintMotd: 'no' + PubkeyAcceptedAlgorithms: "+ssh-rsa" Subsystem: sftp /usr/lib/openssh/sftp-server UsePAM: 'yes' X11Forwarding: 'yes' diff --git a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml index 9370260..470df8c 100644 --- a/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml +++ b/test/integration/default/files/_mapdata/gentoo-2-sysv.yaml @@ -180,6 +180,7 @@ values: AcceptEnv: LANG LC_* ChallengeResponseAuthentication: 'no' PrintMotd: 'no' + PubkeyAcceptedAlgorithms: "+ssh-rsa" Subsystem: sftp /usr/lib/openssh/sftp-server UsePAM: 'yes' X11Forwarding: 'yes' diff --git a/test/salt/pillar/default.sls b/test/salt/pillar/default.sls index ac9f88e..21c8937 100644 --- a/test/salt/pillar/default.sls +++ b/test/salt/pillar/default.sls @@ -27,7 +27,7 @@ sshd_config: {%- endif %} {#- 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 #} - {%- 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" {%- endif %}