Attempt to use a variable for whonix version

Allow to override it from pillars just like others
viq · May 3, 2018 · 4b7a07b · 4b7a07b
1 parent 857ee77
commit 4b7a07b
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 18 deletions.
diff --git a/qvm/anon-whonix.sls b/qvm/anon-whonix.sls
@@ -26,7 +26,7 @@ include:
 {% load_yaml as defaults -%}
 name:          anon-whonix
 present:
-  - template:  whonix-ws-14
+  - template:  whonix-ws-{{ defaults.whonix_version }}
   - label:     red
 prefs:
   - netvm:     sys-whonix
@@ -35,9 +35,9 @@ tags:
   - add:
     - anon-vm
 require:
-  - pkg:       template-whonix-ws-14
+  - pkg:       template-whonix-ws-{{ defaults.whonix_version }}
   - qvm:       sys-whonix
-  - qvm:       whonix-ws-dvm
+  - qvm:       whonix-ws-{{ defaults.whonix_version }}-dvm
 {%- endload %}
 
 {{ load(defaults) }}
diff --git a/qvm/sys-whonix.sls b/qvm/sys-whonix.sls
@@ -25,15 +25,15 @@ include:
 {% load_yaml as defaults -%}
 name:          sys-whonix
 present:
-  - template:  whonix-gw-14
+  - template:  whonix-gw-{{ defaults.whonix_version }}
   - label:     black
   - mem:       500
 prefs:
   - netvm:     sys-firewall
   - provides-network: true
   - autostart: true
 require:
-  - pkg:       template-whonix-gw-14
+  - pkg:       template-whonix-gw-{{ defaults.whonix_version }}
   - qvm:       sys-firewall
 {%- endload %}
 

diff --git a/qvm/template-whonix-gw.sls b/qvm/template-whonix-gw.sls
@@ -11,20 +11,20 @@
 #   qubesctl state.sls qvm.template-whonix-gw dom0
 ##
 
-template-whonix-gw-14:
+template-whonix-gw-{{ defaults.whonix_version }}:
   pkg.installed:
-    - name:     qubes-template-whonix-gw-14
+    - name:     qubes-template-whonix-gw-{{ defaults.whonix_version }}
     - fromrepo: qubes-templates-community
 
 whonix-gw-tag:
   qvm.vm:
-    - name: whonix-gw-14
+    - name: whonix-gw-{{ defaults.whonix_version }}
     - tags:
       - present:
         - whonix-updatevm
     - features:
       - enable:
-        - whonix-gw-14
+        - whonix-gw-{{ defaults.whonix_version }}
 
 whonix-gw-update-policy:
   file.prepend:

diff --git a/qvm/template-whonix-ws.sls b/qvm/template-whonix-ws.sls
@@ -11,20 +11,20 @@
 #   qubesctl state.sls qvm.template-whonix-ws dom0
 ##
 
-template-whonix-ws-14:
+template-whonix-ws-{{ defaults.whonix_version }}:
   pkg.installed:
-    - name:     qubes-template-whonix-ws-14
+    - name:     qubes-template-whonix-ws-{{ defaults.whonix_version }}
     - fromrepo: qubes-templates-community
 
 whonix-ws-tag:
   qvm.vm:
-    - name: whonix-ws-14
+    - name: whonix-ws-{{ defaults.whonix_version }}
     - tags:
       - present:
         - whonix-updatevm
     - features:
       - enable:
-        - whonix-ws-14
+        - whonix-ws-{{ defaults.whonix_version }}
 
 whonix-ws-update-policy:
   file.prepend:

diff --git a/qvm/template.jinja b/qvm/template.jinja
@@ -101,6 +101,9 @@
   {%- do defaults.update(pillar_data) %}
   {%- set force = defaults.get('force', vm.get('force', False)) %}
 
+  {#- Set whonix version in single place #}
+  {% set whonix_version = salt['pillar.get']('qvm:whonix:version', '14') %}
+
   {#- Only attempt to install the VM if it is missing (not installed) to prevent
    # changing an existing configuration, unless ``force`` is True.
    #}

diff --git a/qvm/whonix-ws-dvm.sls b/qvm/whonix-ws-dvm.sls
@@ -25,29 +25,29 @@ include:
 {% set gui_user = salt['cmd.shell']('groupmems -l -g qubes') %}
 
 {% load_yaml as defaults -%}
-name:          whonix-ws-dvm
+name:          whonix-ws-{{ defaults.whonix_version }}-dvm
 present:
-  - template:  whonix-ws-14
+  - template:  whonix-ws-{{ defaults.whonix_version }}
   - label:     red
 prefs:
   - netvm:     sys-whonix
   - template-for-dispvms: true
-  - default-dispvm: whonix-ws-dvm
+  - default-dispvm: whonix-ws-{{ defaults.whonix_version }}-dvm
 tags:
   - add:
     - anon-vm
 features:
   - enable:
     - appmenus-dispvm
 require:
-  - pkg:       template-whonix-ws-14
+  - pkg:       template-whonix-ws-{{ defaults.whonix_version }}
   - qvm:       sys-whonix
 {%- endload %}
 
 qvm-appmenus --update whonix-ws-dvm:
   cmd.run:
     - runas: {{ gui_user }}
     - onchanges:
-      - qvm:  whonix-ws-dvm
+      - qvm:  whonix-ws-{{ defaults.whonix_version }}-dvm
 
 {{ load(defaults) }}