File tree Expand file tree Collapse file tree 13 files changed +16
-16
lines changed
desktop/optional_features Expand file tree Collapse file tree 13 files changed +16
-16
lines changed Original file line number Diff line number Diff line change @@ -17,7 +17,7 @@ driver:
17
17
# provider: hyperv
18
18
# network:
19
19
# - ['private_network', bridge: 'Default Switch']
20
- gui : false
20
+ gui : true
21
21
vagrantfiles :
22
22
# stop virtualbox guest additions update
23
23
- test/vagrant_vb_guest.rb
@@ -157,9 +157,9 @@ suites:
157
157
provisioner :
158
158
salt_bootstrap_options : " -version 2019.2.3 -pythonVersion 3"
159
159
# 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"
163
163
# - name: py2
164
164
# provisioner:
165
165
# salt_bootstrap_options: "-version 2019.2.3 -pythonVersion 2"
Original file line number Diff line number Diff line change 2
2
{% - from tplroot ~ "/map.jinja" import windows with context %}
3
3
{% - if windows .system .enabled and windows .system .desktop .enabled and windows .system .desktop .optional_features .enabled and 'Server' not in grains ['osfinger' ] %}
4
4
{% - set action = sls .split ('.' )[-1] %}
5
- {% - include slspath + "/optional_features.jinja" %}
5
+ {% - include tpldir + "/optional_features.jinja" %}
6
6
{% - endif %}
Original file line number Diff line number Diff line change 1
1
# -*- coding: utf-8 -*-
2
2
# vim: ft=sls
3
- {%- include slspath + " /action.jinja" %}
3
+ {%- include tpldir + " /action.jinja" %}
Original file line number Diff line number Diff line change 1
1
# -*- coding: utf-8 -*-
2
2
# vim: ft=sls
3
- {%- include slspath + " /action.jinja" %}
3
+ {%- include tpldir + " /action.jinja" %}
Original file line number Diff line number Diff line change 3
3
{% - from "windows/map.jinja" import windows with context %}
4
4
{% - if windows .system .enabled and windows .system .packages .saltstack .enabled %}
5
5
{% - set action = sls .split ('.' )[-1] %}
6
- {% - include slspath + "/packages.jinja" %}
6
+ {% - include tpldir + "/packages.jinja" %}
7
7
{% - endif %}
Original file line number Diff line number Diff line change 1
1
{% - from "windows/map.jinja" import windows with context %}
2
2
{% - if windows .system .enabled and windows .system .packages .enabled and windows .system .packages .saltstack .enabled %}
3
3
{% - set action = sls .split ('.' )[-1] %}
4
- {% - include slspath + "/pkg.jinja" %}
4
+ {% - include tpldir + "/pkg.jinja" %}
5
5
{% - endif %}
Original file line number Diff line number Diff line change 1
1
# -*- coding: utf-8 -*-
2
2
# vim: ft=sls
3
- {%- include slspath + " /action.jinja" %}
3
+ {%- include tpldir + " /action.jinja" %}
Original file line number Diff line number Diff line change 1
1
# -*- coding: utf-8 -*-
2
2
# vim: ft=sls
3
- {%- include slspath + " /action.jinja" %}
3
+ {%- include tpldir + " /action.jinja" %}
Original file line number Diff line number Diff line change 2
2
{% - from tplroot ~ "/map.jinja" import windows with context %}
3
3
{% - if windows .system .enabled and windows .system .server .enabled and windows .system .server .features .enabled and 'Server' in grains ['osfinger' ] %}
4
4
{% - set action = sls .split ('.' )[-1] %}
5
- {% - include slspath + "/features.jinja" %}
5
+ {% - include tpldir + "/features.jinja" %}
6
6
{% - endif %}
Original file line number Diff line number Diff line change 1
1
# -*- coding: utf-8 -*-
2
2
# vim: ft=sls
3
- {%- include slspath + " /action.jinja" %}
3
+ {%- include tpldir + " /action.jinja" %}
You can’t perform that action at this time.
0 commit comments