Merge pull request #196 from baby-gnu/fix/tofs-pillars

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

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

test/integration/default/files/_mapdata/amazonlinux-1.yaml

@@ -151,6 +151,16 @@ openssh:
   sshd_config_src: sshd_config
   sshd_config_user: root
   sshd_enable: true
+  tofs:
+    source_files:
+      manage ssh_known_hosts file:
+      - alt_ssh_known_hosts
+      ssh_config:
+      - alt_ssh_config
+      sshd_banner:
+      - fire_banner
+      sshd_config:
+      - alt_sshd_config
 ssh_config:
   Hosts:
     '*':

test/integration/default/files/_mapdata/amazonlinux-2.yaml

@@ -151,6 +151,16 @@ openssh:
   sshd_config_src: sshd_config
   sshd_config_user: root
   sshd_enable: true
+  tofs:
+    source_files:
+      manage ssh_known_hosts file:
+      - alt_ssh_known_hosts
+      ssh_config:
+      - alt_ssh_config
+      sshd_banner:
+      - fire_banner
+      sshd_config:
+      - alt_sshd_config
 ssh_config:
   Hosts:
     '*':

test/integration/default/files/_mapdata/arch-base-latest.yaml

@@ -151,6 +151,16 @@ openssh:
   sshd_config_src: sshd_config
   sshd_config_user: root
   sshd_enable: true
+  tofs:
+    source_files:
+      manage ssh_known_hosts file:
+      - alt_ssh_known_hosts
+      ssh_config:
+      - alt_ssh_config
+      sshd_banner:
+      - fire_banner
+      sshd_config:
+      - alt_sshd_config
 ssh_config:
   Hosts:
     '*':

test/integration/default/files/_mapdata/centos-6.yaml

@@ -151,6 +151,16 @@ openssh:
   sshd_config_src: sshd_config
   sshd_config_user: root
   sshd_enable: true
+  tofs:
+    source_files:
+      manage ssh_known_hosts file:
+      - alt_ssh_known_hosts
+      ssh_config:
+      - alt_ssh_config
+      sshd_banner:
+      - fire_banner
+      sshd_config:
+      - alt_sshd_config
 ssh_config:
   Hosts:
     '*':

test/integration/default/files/_mapdata/centos-7.yaml

@@ -151,6 +151,16 @@ openssh:
   sshd_config_src: sshd_config
   sshd_config_user: root
   sshd_enable: true
+  tofs:
+    source_files:
+      manage ssh_known_hosts file:
+      - alt_ssh_known_hosts
+      ssh_config:
+      - alt_ssh_config
+      sshd_banner:
+      - fire_banner
+      sshd_config:
+      - alt_sshd_config
 ssh_config:
   Hosts:
     '*':

test/integration/default/files/_mapdata/centos-8.yaml

@@ -151,6 +151,16 @@ openssh:
   sshd_config_src: sshd_config
   sshd_config_user: root
   sshd_enable: true
+  tofs:
+    source_files:
+      manage ssh_known_hosts file:
+      - alt_ssh_known_hosts
+      ssh_config:
+      - alt_ssh_config
+      sshd_banner:
+      - fire_banner
+      sshd_config:
+      - alt_sshd_config
 ssh_config:
   Hosts:
     '*':

test/integration/default/files/_mapdata/debian-10.yaml

@@ -151,6 +151,16 @@ openssh:
   sshd_config_src: sshd_config
   sshd_config_user: root
   sshd_enable: true
+  tofs:
+    source_files:
+      manage ssh_known_hosts file:
+      - alt_ssh_known_hosts
+      ssh_config:
+      - alt_ssh_config
+      sshd_banner:
+      - fire_banner
+      sshd_config:
+      - alt_sshd_config
 ssh_config:
   Hosts:
     '*':

test/integration/default/files/_mapdata/debian-9.yaml

@@ -151,6 +151,16 @@ openssh:
   sshd_config_src: sshd_config
   sshd_config_user: root
   sshd_enable: true
+  tofs:
+    source_files:
+      manage ssh_known_hosts file:
+      - alt_ssh_known_hosts
+      ssh_config:
+      - alt_ssh_config
+      sshd_banner:
+      - fire_banner
+      sshd_config:
+      - alt_sshd_config
 ssh_config:
   Hosts:
     '*':

test/integration/default/files/_mapdata/fedora-31.yaml

@@ -151,6 +151,16 @@ openssh:
   sshd_config_src: sshd_config
   sshd_config_user: root
   sshd_enable: true
+  tofs:
+    source_files:
+      manage ssh_known_hosts file:
+      - alt_ssh_known_hosts
+      ssh_config:
+      - alt_ssh_config
+      sshd_banner:
+      - fire_banner
+      sshd_config:
+      - alt_sshd_config
 ssh_config:
   Hosts:
     '*':

test/integration/default/files/_mapdata/fedora-32.yaml

@@ -151,6 +151,16 @@ openssh:
   sshd_config_src: sshd_config
   sshd_config_user: root
   sshd_enable: true
+  tofs:
+    source_files:
+      manage ssh_known_hosts file:
+      - alt_ssh_known_hosts
+      ssh_config:
+      - alt_ssh_config
+      sshd_banner:
+      - fire_banner
+      sshd_config:
+      - alt_sshd_config
 ssh_config:
   Hosts:
     '*':

test/integration/default/files/_mapdata/opensuse-15.yaml

@@ -151,6 +151,16 @@ openssh:
   sshd_config_src: sshd_config
   sshd_config_user: root
   sshd_enable: true
+  tofs:
+    source_files:
+      manage ssh_known_hosts file:
+      - alt_ssh_known_hosts
+      ssh_config:
+      - alt_ssh_config
+      sshd_banner:
+      - fire_banner
+      sshd_config:
+      - alt_sshd_config
 ssh_config:
   Hosts:
     '*':

test/integration/default/files/_mapdata/ubuntu-16.yaml

@@ -151,6 +151,16 @@ openssh:
   sshd_config_src: sshd_config
   sshd_config_user: root
   sshd_enable: true
+  tofs:
+    source_files:
+      manage ssh_known_hosts file:
+      - alt_ssh_known_hosts
+      ssh_config:
+      - alt_ssh_config
+      sshd_banner:
+      - fire_banner
+      sshd_config:
+      - alt_sshd_config
 ssh_config:
   Hosts:
     '*':

test/integration/default/files/_mapdata/ubuntu-18.yaml

@@ -151,6 +151,16 @@ openssh:
   sshd_config_src: sshd_config
   sshd_config_user: root
   sshd_enable: true
+  tofs:
+    source_files:
+      manage ssh_known_hosts file:
+      - alt_ssh_known_hosts
+      ssh_config:
+      - alt_ssh_config
+      sshd_banner:
+      - fire_banner
+      sshd_config:
+      - alt_sshd_config
 ssh_config:
   Hosts:
     '*':

test/integration/default/files/_mapdata/ubuntu-20.yaml

@@ -151,6 +151,16 @@ openssh:
   sshd_config_src: sshd_config
   sshd_config_user: root
   sshd_enable: true
+  tofs:
+    source_files:
+      manage ssh_known_hosts file:
+      - alt_ssh_known_hosts
+      ssh_config:
+      - alt_ssh_config
+      sshd_banner:
+      - fire_banner
+      sshd_config:
+      - alt_sshd_config
 ssh_config:
   Hosts:
     '*':

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