Browse Source

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

Need this on Arch Linux to avoid the `kitchen verify` failure; see:

* https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/-/commit/cb6781a2bba9
tags/v3.0.2
Imran Iqbal 3 years ago
parent
commit
ecd62e4507
No account linked to committer's email address
2 changed files with 6 additions and 0 deletions
  1. +1
    -0
      test/integration/default/files/_mapdata/arch-base-latest.yaml
  2. +5
    -0
      test/salt/pillar/default.sls

+ 1
- 0
test/integration/default/files/_mapdata/arch-base-latest.yaml View File

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'

+ 5
- 0
test/salt/pillar/default.sls View File

{%- if grains.os != "OpenBSD" %} {%- if grains.os != "OpenBSD" %}
UsePAM: 'yes' UsePAM: 'yes'
{%- endif %} {%- endif %}
{#- Need this on Arch Linux to avoid the `kitchen verify` failure as mentioned above; see: #}
{#- * https://gitlab.com/saltstack-formulas/infrastructure/salt-image-builder/-/commit/cb6781a2bba9 #}
{%- if grains.os == "Arch" %}
PubkeyAcceptedAlgorithms: "+ssh-rsa"
{%- endif %}


ssh_config: ssh_config:
Hosts: Hosts:

Loading…
Cancel
Save