소스 검색

fix(pillar): `tofs` must not be under `mine_functions`

The debug output of test jobs don't show the use of TOFS as it should
and the pillar.example show that `tofs` is under `mine_functions`
instead of `openssh`.

* pillar.example: move `tofs` under `openssh`.

* test/salt/pillar/default.sls: ditoo.
tags/v2.0.4
Daniel Dehennin 4 년 전
부모
커밋
c0d5052f6a
2개의 변경된 파일20개의 추가작업 그리고 20개의 파일을 삭제
  1. +10
    -10
      pillar.example
  2. +10
    -10
      test/salt/pillar/default.sls

+ 10
- 10
pillar.example 파일 보기

@@ -361,16 +361,6 @@ openssh:
# salt://files/ssh/moduli.hash
# These will be automatically referenced to by the ssh_moduli state.

# Required for openssh.known_hosts
mine_functions:
public_ssh_host_keys:
mine_function: cmd.run
cmd: cat /etc/ssh/ssh_host_*_key.pub
python_shell: true
public_ssh_hostname:
mine_function: grains.get
key: id

tofs:
# The files_switch key serves as a selector for alternative
# directories under the formula files directory. See TOFS pattern
@@ -399,3 +389,13 @@ mine_functions:
- alt_ssh_config
sshd_banner:
- fire_banner

# Required for openssh.known_hosts
mine_functions:
public_ssh_host_keys:
mine_function: cmd.run
cmd: cat /etc/ssh/ssh_host_*_key.pub
python_shell: true
public_ssh_hostname:
mine_function: grains.get
key: id

+ 10
- 10
test/salt/pillar/default.sls 파일 보기

@@ -189,16 +189,6 @@ openssh:
# salt://files/ssh/moduli.hash
# These will be automatically referenced to by the ssh_moduli state.

# Required for openssh.known_hosts
mine_functions:
public_ssh_host_keys:
mine_function: cmd.run
cmd: cat /etc/ssh/ssh_host_*_key.pub
python_shell: true
public_ssh_hostname:
mine_function: grains.get
key: id

tofs:
# The files_switch key serves as a selector for alternative
# directories under the formula files directory. See TOFS pattern
@@ -227,3 +217,13 @@ mine_functions:
- alt_ssh_config
sshd_banner:
- fire_banner

# Required for openssh.known_hosts
mine_functions:
public_ssh_host_keys:
mine_function: cmd.run
cmd: cat /etc/ssh/ssh_host_*_key.pub
python_shell: true
public_ssh_hostname:
mine_function: grains.get
key: id

Loading…
취소
저장