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.
This commit is contained in:
Daniel Dehennin 2020-09-27 20:17:05 +02:00
parent 5e9033f500
commit c0d5052f6a
2 changed files with 20 additions and 20 deletions

View File

@ -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

View File

@ -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