feat: supports salt v3000

saltstack/salt#56119 slspath ==> tpldir
clearasmudd · Mar 5, 2020 · fd4fe50 · fd4fe50
1 parent d9ad78c
commit fd4fe50
Show file tree

Hide file tree

Showing 13 changed files with 16 additions and 16 deletions.
diff --git a/.kitchen.yml b/.kitchen.yml
@@ -17,7 +17,7 @@ driver:
   # provider: hyperv
   # network:
   # - ['private_network', bridge: 'Default Switch']
-  gui: false
+  gui: true
   vagrantfiles:
     # stop virtualbox guest additions update
     - test/vagrant_vb_guest.rb
@@ -157,9 +157,9 @@ suites:
     provisioner:
       salt_bootstrap_options: "-version 2019.2.3 -pythonVersion 3"
       # salt_version: latest
-      # - name: py3-3000
-      #   provisioner:
-      #     salt_bootstrap_options: "-version 3000 -pythonVersion 3"
+  - name: py3-3000
+    provisioner:
+      salt_bootstrap_options: "-version 3000 -pythonVersion 3"
       # - name: py2
       #   provisioner:
       #     salt_bootstrap_options: "-version 2019.2.3 -pythonVersion 2"
diff --git a/windows/system/desktop/optional_features/action.jinja b/windows/system/desktop/optional_features/action.jinja
@@ -2,5 +2,5 @@
 {%- from tplroot ~ "/map.jinja" import windows with context %}
 {%- if windows.system.enabled and windows.system.desktop.enabled and windows.system.desktop.optional_features.enabled and 'Server' not in grains['osfinger'] %}
   {%- set action = sls.split('.')[-1] %}
-  {%- include slspath + "/optional_features.jinja" %}
+  {%- include tpldir + "/optional_features.jinja" %}
 {%- endif %}
diff --git a/windows/system/desktop/optional_features/feature_installed.sls b/windows/system/desktop/optional_features/feature_installed.sls
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
-{%- include slspath + "/action.jinja" %}
+{%- include tpldir + "/action.jinja" %}
diff --git a/windows/system/desktop/optional_features/feature_removed.sls b/windows/system/desktop/optional_features/feature_removed.sls
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
-{%- include slspath + "/action.jinja" %}
+{%- include tpldir + "/action.jinja" %}
diff --git a/windows/system/packages/chocolatey/action.jinja b/windows/system/packages/chocolatey/action.jinja
@@ -3,5 +3,5 @@
 {%- from "windows/map.jinja" import windows with context %}
 {%- if windows.system.enabled and windows.system.packages.saltstack.enabled %}
   {%- set action = sls.split('.')[-1] %}
-  {%- include slspath + "/packages.jinja" %}
+  {%- include tpldir + "/packages.jinja" %}
 {%- endif %}
diff --git a/windows/system/packages/saltstack/action.jinja b/windows/system/packages/saltstack/action.jinja
@@ -1,5 +1,5 @@
 {%- from "windows/map.jinja" import windows with context %}
 {%- if windows.system.enabled and windows.system.packages.enabled and windows.system.packages.saltstack.enabled %}
   {%- set action = sls.split('.')[-1] %}
-  {%- include slspath + "/pkg.jinja" %}
+  {%- include tpldir + "/pkg.jinja" %}
 {%- endif %}
diff --git a/windows/system/packages/saltstack/installed.sls b/windows/system/packages/saltstack/installed.sls
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
-{%- include slspath + "/action.jinja" %}
+{%- include tpldir + "/action.jinja" %}
diff --git a/windows/system/packages/saltstack/latest.sls b/windows/system/packages/saltstack/latest.sls
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
-{%- include slspath + "/action.jinja" %}
+{%- include tpldir + "/action.jinja" %}
diff --git a/windows/system/server/features/action.jinja b/windows/system/server/features/action.jinja
@@ -2,5 +2,5 @@
 {%- from tplroot ~ "/map.jinja" import windows with context %}
 {%- if windows.system.enabled and windows.system.server.enabled and windows.system.server.features.enabled and 'Server' in grains['osfinger'] %}
   {%- set action = sls.split('.')[-1] %}
-  {%- include slspath + "/features.jinja" %}
+  {%- include tpldir + "/features.jinja" %}
 {%- endif %}
diff --git a/windows/system/server/features/installed.sls b/windows/system/server/features/installed.sls
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
-{%- include slspath + "/action.jinja" %}
+{%- include tpldir + "/action.jinja" %}
diff --git a/windows/system/server/features/removed.sls b/windows/system/server/features/removed.sls
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
-{%- include slspath + "/action.jinja" %}
+{%- include tpldir + "/action.jinja" %}
diff --git a/windows/system/user/action.jinja b/windows/system/user/action.jinja
@@ -2,5 +2,5 @@
 {%- from tplroot ~ "/map.jinja" import windows with context %}
 {%- if windows.system.enabled and windows.system.users.enabled %}
   {%- set action = sls.split('.')[-1] %}
-  {%- include slspath + "/add.jinja" %}
+  {%- include tpldir + "/add.jinja" %}
 {%- endif %}
diff --git a/windows/system/user/present.sls b/windows/system/user/present.sls
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 # vim: ft=sls
-{%- include slspath + "/action.jinja" %}
+{%- include tpldir + "/action.jinja" %}