Skip to content

Commit c0d5052

Browse files
committed
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.
1 parent 5e9033f commit c0d5052

File tree

2 files changed

+20
-20
lines changed

2 files changed

+20
-20
lines changed

pillar.example

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -361,16 +361,6 @@ openssh:
361361
# salt://files/ssh/moduli.hash
362362
# These will be automatically referenced to by the ssh_moduli state.
363363

364-
# Required for openssh.known_hosts
365-
mine_functions:
366-
public_ssh_host_keys:
367-
mine_function: cmd.run
368-
cmd: cat /etc/ssh/ssh_host_*_key.pub
369-
python_shell: true
370-
public_ssh_hostname:
371-
mine_function: grains.get
372-
key: id
373-
374364
tofs:
375365
# The files_switch key serves as a selector for alternative
376366
# directories under the formula files directory. See TOFS pattern
@@ -399,3 +389,13 @@ mine_functions:
399389
- alt_ssh_config
400390
sshd_banner:
401391
- fire_banner
392+
393+
# Required for openssh.known_hosts
394+
mine_functions:
395+
public_ssh_host_keys:
396+
mine_function: cmd.run
397+
cmd: cat /etc/ssh/ssh_host_*_key.pub
398+
python_shell: true
399+
public_ssh_hostname:
400+
mine_function: grains.get
401+
key: id

test/salt/pillar/default.sls

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -189,16 +189,6 @@ openssh:
189189
# salt://files/ssh/moduli.hash
190190
# These will be automatically referenced to by the ssh_moduli state.
191191

192-
# Required for openssh.known_hosts
193-
mine_functions:
194-
public_ssh_host_keys:
195-
mine_function: cmd.run
196-
cmd: cat /etc/ssh/ssh_host_*_key.pub
197-
python_shell: true
198-
public_ssh_hostname:
199-
mine_function: grains.get
200-
key: id
201-
202192
tofs:
203193
# The files_switch key serves as a selector for alternative
204194
# directories under the formula files directory. See TOFS pattern
@@ -227,3 +217,13 @@ mine_functions:
227217
- alt_ssh_config
228218
sshd_banner:
229219
- fire_banner
220+
221+
# Required for openssh.known_hosts
222+
mine_functions:
223+
public_ssh_host_keys:
224+
mine_function: cmd.run
225+
cmd: cat /etc/ssh/ssh_host_*_key.pub
226+
python_shell: true
227+
public_ssh_hostname:
228+
mine_function: grains.get
229+
key: id

0 commit comments

Comments
 (0)