瀏覽代碼

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

tags/v3.0.2
Imran Iqbal 3 年之前
父節點
當前提交
d65ea55d94
沒有連結到貢獻者的電子郵件帳戶。
共有 3 個檔案被更改,包括 3 行新增1 行删除
  1. +1
    -0
      test/integration/default/files/_mapdata/gentoo-2-sysd.yaml
  2. +1
    -0
      test/integration/default/files/_mapdata/gentoo-2-sysv.yaml
  3. +1
    -1
      test/salt/pillar/default.sls

+ 1
- 0
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'

+ 1
- 0
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'

+ 1
- 1
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 %}


Loading…
取消
儲存