Skip to content

Commit

Permalink
fix(pillar): tofs must not be under mine_functions
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
baby-gnu committed Sep 27, 2020
1 parent 5e9033f commit c0d5052
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 20 deletions.
20 changes: 10 additions & 10 deletions pillar.example
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
20 changes: 10 additions & 10 deletions test/salt/pillar/default.sls
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

0 comments on commit c0d5052

Please sign in to comment.