Merge branch 'saltstack-formulas:master' into master

kitchen.vagrant.yml

@@ -67,8 +67,8 @@ platforms:
           C:\Users\vagrant\AppData\Local\Temp\kitchen\var\cache\salt\minion\files\base `
           -ErrorAction SilentlyContinue
         salt-call --local state.single file.managed `
-          C:\Users\vagrant\AppData\Local\Temp\kitchen\srv\salt\win\repo-ng\salt-minion-py3.sls `
-          source=https://github.com/saltstack/salt-winrepo-ng/raw/master/salt-minion-py3.sls `
+          C:\Users\vagrant\AppData\Local\Temp\kitchen\srv\salt\win\repo-ng\salt-minion.sls `
+          source=https://github.com/saltstack/salt-winrepo-ng/raw/master/salt-minion.sls `
           skip_verify=True makedirs=True
         exit 0
       # yamllint enable rule:line-length
@@ -91,8 +91,8 @@ platforms:
           C:\Users\vagrant\AppData\Local\Temp\kitchen\var\cache\salt\minion\files\base `
           -ErrorAction SilentlyContinue
         salt-call --local state.single file.managed `
-          C:\Users\vagrant\AppData\Local\Temp\kitchen\srv\salt\win\repo-ng\salt-minion-py3.sls `
-          source=https://github.com/saltstack/salt-winrepo-ng/raw/master/salt-minion-py3.sls `
+          C:\Users\vagrant\AppData\Local\Temp\kitchen\srv\salt\win\repo-ng\salt-minion.sls `
+          source=https://github.com/saltstack/salt-winrepo-ng/raw/master/salt-minion.sls `
           skip_verify=True makedirs=True
         exit 0
       # yamllint enable rule:line-length

kitchen.windows.yml

@@ -15,8 +15,8 @@ provisioner:
   # yamllint disable rule:line-length
   init_environment: |
     salt-call --local state.single file.managed `
-      C:\Users\kitchen\AppData\Local\Temp\kitchen\srv\salt\win\repo-ng\salt-minion-py3.sls `
-      source=https://github.com/saltstack/salt-winrepo-ng/raw/master/salt-minion-py3.sls `
+      C:\Users\kitchen\AppData\Local\Temp\kitchen\srv\salt\win\repo-ng\salt-minion.sls `
+      source=https://github.com/saltstack/salt-winrepo-ng/raw/master/salt-minion.sls `
       skip_verify=True makedirs=True
   # yamllint enable rule:line-length