test(pillar): add ssh-rsa Kitchen workaround on Gentoo [skip ci]

saltstack-formulas · Jan 5, 2022 · d65ea55 · d65ea55
1 parent 4ba57d3
commit d65ea55
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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
@@ -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 %}