Skip to content

Commit fd4fe50

Browse files
committed
feat: supports salt v3000
saltstack/salt#56119 slspath ==> tpldir
1 parent d9ad78c commit fd4fe50

File tree

13 files changed

+16
-16
lines changed

13 files changed

+16
-16
lines changed

.kitchen.yml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ driver:
1717
# provider: hyperv
1818
# network:
1919
# - ['private_network', bridge: 'Default Switch']
20-
gui: false
20+
gui: true
2121
vagrantfiles:
2222
# stop virtualbox guest additions update
2323
- test/vagrant_vb_guest.rb
@@ -157,9 +157,9 @@ suites:
157157
provisioner:
158158
salt_bootstrap_options: "-version 2019.2.3 -pythonVersion 3"
159159
# salt_version: latest
160-
# - name: py3-3000
161-
# provisioner:
162-
# salt_bootstrap_options: "-version 3000 -pythonVersion 3"
160+
- name: py3-3000
161+
provisioner:
162+
salt_bootstrap_options: "-version 3000 -pythonVersion 3"
163163
# - name: py2
164164
# provisioner:
165165
# salt_bootstrap_options: "-version 2019.2.3 -pythonVersion 2"

windows/system/desktop/optional_features/action.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
{%- from tplroot ~ "/map.jinja" import windows with context %}
33
{%- if windows.system.enabled and windows.system.desktop.enabled and windows.system.desktop.optional_features.enabled and 'Server' not in grains['osfinger'] %}
44
{%- set action = sls.split('.')[-1] %}
5-
{%- include slspath + "/optional_features.jinja" %}
5+
{%- include tpldir + "/optional_features.jinja" %}
66
{%- endif %}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# -*- coding: utf-8 -*-
22
# vim: ft=sls
3-
{%- include slspath + "/action.jinja" %}
3+
{%- include tpldir + "/action.jinja" %}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# -*- coding: utf-8 -*-
22
# vim: ft=sls
3-
{%- include slspath + "/action.jinja" %}
3+
{%- include tpldir + "/action.jinja" %}

windows/system/packages/chocolatey/action.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
{%- from "windows/map.jinja" import windows with context %}
44
{%- if windows.system.enabled and windows.system.packages.saltstack.enabled %}
55
{%- set action = sls.split('.')[-1] %}
6-
{%- include slspath + "/packages.jinja" %}
6+
{%- include tpldir + "/packages.jinja" %}
77
{%- endif %}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{%- from "windows/map.jinja" import windows with context %}
22
{%- if windows.system.enabled and windows.system.packages.enabled and windows.system.packages.saltstack.enabled %}
33
{%- set action = sls.split('.')[-1] %}
4-
{%- include slspath + "/pkg.jinja" %}
4+
{%- include tpldir + "/pkg.jinja" %}
55
{%- endif %}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# -*- coding: utf-8 -*-
22
# vim: ft=sls
3-
{%- include slspath + "/action.jinja" %}
3+
{%- include tpldir + "/action.jinja" %}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# -*- coding: utf-8 -*-
22
# vim: ft=sls
3-
{%- include slspath + "/action.jinja" %}
3+
{%- include tpldir + "/action.jinja" %}

windows/system/server/features/action.jinja

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@
22
{%- from tplroot ~ "/map.jinja" import windows with context %}
33
{%- if windows.system.enabled and windows.system.server.enabled and windows.system.server.features.enabled and 'Server' in grains['osfinger'] %}
44
{%- set action = sls.split('.')[-1] %}
5-
{%- include slspath + "/features.jinja" %}
5+
{%- include tpldir + "/features.jinja" %}
66
{%- endif %}
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# -*- coding: utf-8 -*-
22
# vim: ft=sls
3-
{%- include slspath + "/action.jinja" %}
3+
{%- include tpldir + "/action.jinja" %}

0 commit comments

Comments
 (0)