mirror of
https://github.com/ben-grande/qusal.git
synced 2024-12-18 20:34:35 -05:00
620fa10a69
Template was not set to shutdown after patch to avoid double the amount of startups at shutdown required due to the salt patch that a package needs to be installed during the "create" state. Proven to cause problems in case a qube based on the same template requires a package that is installed during the "install" state. Other fedora-minimal templates "mgmt" and "sys-pgp" are unaffected. Fixes: https://github.com/ben-grande/qusal/issues/70
120 lines
2.7 KiB
Plaintext
120 lines
2.7 KiB
Plaintext
{#
|
|
SPDX-FileCopyrightText: 2023 - 2024 Benjamin Grande M. S. <ben.grande.b@gmail.com>
|
|
|
|
SPDX-License-Identifier: AGPL-3.0-or-later
|
|
#}
|
|
|
|
{%- from "qvm/template.jinja" import load -%}
|
|
|
|
include:
|
|
- .clone
|
|
- fedora-minimal.prefs
|
|
|
|
{% load_yaml as defaults -%}
|
|
name: tpl-{{ slsdotpath }}
|
|
force: True
|
|
require:
|
|
- sls: {{ slsdotpath }}.clone
|
|
- sls: fedora-minimal.prefs
|
|
prefs:
|
|
- audiovm: ""
|
|
{%- endload %}
|
|
{{ load(defaults) }}
|
|
|
|
{% load_yaml as defaults -%}
|
|
name: dvm-{{ slsdotpath }}
|
|
force: True
|
|
require:
|
|
- sls: {{ slsdotpath }}.clone
|
|
present:
|
|
- template: tpl-{{ slsdotpath }}
|
|
- label: red
|
|
prefs:
|
|
- template: tpl-{{ slsdotpath }}
|
|
- label: red
|
|
- audiovm: ""
|
|
- vcpus: 4
|
|
- memory: 400
|
|
- maxmem: 4000
|
|
- autostart: False
|
|
- template_for_dispvms: True
|
|
- include_in_backups: False
|
|
features:
|
|
- enable:
|
|
- appmenus-dispvm
|
|
- disable:
|
|
- service.cups
|
|
- service.cups-browsed
|
|
{%- endload %}
|
|
{{ load(defaults) }}
|
|
|
|
{% load_yaml as defaults -%}
|
|
name: {{ slsdotpath }}
|
|
force: True
|
|
require:
|
|
- sls: {{ slsdotpath }}.clone
|
|
present:
|
|
- template: tpl-{{ slsdotpath }}
|
|
- label: gray
|
|
prefs:
|
|
- template: tpl-{{ slsdotpath }}
|
|
- label: gray
|
|
- audiovm: ""
|
|
- memory: 400
|
|
- maxmem: 800
|
|
- vcpus: 1
|
|
- default_dispvm: dvm-{{ slsdotpath }}
|
|
features:
|
|
- enable:
|
|
- service.split-gpg2-client
|
|
- disable:
|
|
- service.cups
|
|
- service.cups-browsed
|
|
{%- endload %}
|
|
{{ load(defaults) }}
|
|
|
|
"{{ slsdotpath }}-extend-private-volume":
|
|
cmd.run:
|
|
- name: qvm-volume extend {{ slsdotpath }}:private 30Gi
|
|
- require:
|
|
- qvm: {{ slsdotpath }}
|
|
|
|
"dvm-{{ slsdotpath }}-extend-private-volume":
|
|
cmd.run:
|
|
- name: qvm-volume extend dvm-{{ slsdotpath }}:private 30Gi
|
|
- require:
|
|
- qvm: dvm-{{ slsdotpath }}
|
|
|
|
{% from 'utils/macros/policy.sls' import policy_set with context -%}
|
|
{{ policy_set(sls_path, '70') }}
|
|
|
|
"{{ slsdotpath }}-set-management_dispvm-to-dvm-fedora":
|
|
qvm.vm:
|
|
- require:
|
|
- qvm: dvm-fedora
|
|
- name: tpl-{{ slsdotpath }}
|
|
- prefs:
|
|
- management_dispvm: dvm-fedora
|
|
|
|
## TODO: Remove when template with patch reaches upstream or updates enforce
|
|
## salt-deps to be installed.
|
|
## https://github.com/QubesOS/qubes-issues/issues/8806
|
|
"{{ slsdotpath }}-install-salt-deps":
|
|
cmd.script:
|
|
- require:
|
|
- qvm: "{{ slsdotpath }}-set-management_dispvm-to-dvm-fedora"
|
|
- name: salt-patch.sh
|
|
- source: salt://fedora-minimal/files/admin/bin/salt-patch.sh
|
|
- args: tpl-{{ slsdotpath }}
|
|
|
|
## TODO: Remove when template with patch reaches upstream or updates enforce
|
|
## salt-deps to be installed.
|
|
## https://github.com/QubesOS/qubes-issues/issues/8806
|
|
"{{ slsdotpath }}-shutdown-template":
|
|
qvm.shutdown:
|
|
- require:
|
|
- qvm: "{{ slsdotpath }}-set-management_dispvm-to-default"
|
|
- name: tpl-{{ slsdotpath }}
|
|
- flags:
|
|
- force
|