1 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
2 Date: Sun, 20 Aug 2017 22:41:26 +0200
3 Subject: [PATCH] mcp: salt-formulas: armband: Extend libvirt_domain
5 Add new state in armband salt formula that extends salt's virt
6 libvirt_domain.jinja template with support for:
11 These will later be leveraged via salt virt formula with AArch64
14 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
16 mcp/config/states/maas | 2 +-
17 .../armband/files/libvirt_domain.jinja.diff | 46 ++++++++++++++++++++++
18 .../armband/libvirt_domain_template.sls | 4 ++
19 3 files changed, 51 insertions(+), 1 deletion(-)
20 create mode 100644 mcp/salt-formulas/armband/files/libvirt_domain.jinja.diff
21 create mode 100644 mcp/salt-formulas/armband/libvirt_domain_template.sls
23 diff --git a/mcp/config/states/maas b/mcp/config/states/maas
24 index 4b306af..d99dfc4 100755
25 --- a/mcp/config/states/maas
26 +++ b/mcp/config/states/maas
27 @@ -48,7 +48,7 @@ wait_for "! salt '*' test.ping | tee /dev/stderr | fgrep -q 'Not connected'"
29 salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
31 -salt -C 'kvm*' state.sls armband
32 +salt -C 'kvm*' state.sls armband,armband.libvirt_domain_template
33 salt -C 'kvm*' state.sls libvirt
35 salt -C '* and not cfg01* and not mas01*' state.apply salt
36 diff --git a/mcp/salt-formulas/armband/files/libvirt_domain.jinja.diff b/mcp/salt-formulas/armband/files/libvirt_domain.jinja.diff
38 index 0000000..4e7fad5
40 +++ b/mcp/salt-formulas/armband/files/libvirt_domain.jinja.diff
42 +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
43 +Date: Sun Aug 20 18:18:53 2017 +0200
44 +Subject: [PATCH] libvirt_domain.jinja: Add AArch64 support
46 +Salt virt state relies on a Jinja template to create a libvirt
47 +XML definition for each new VM.
48 +This template needs to be extended with a few specific options
50 +- UEFI loader support (pflash);
51 +- custom machine model (e.g. 'virt-2.9'), since AArch64 defaults to
55 +Allow all these to be parametrized from the salt virt formula,
56 +which we will also adapt to allow the params to be passed via our
59 +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
62 +diff --git a/usr/lib/python2.7/dist-packages/salt/templates/virt/libvirt_domain.jinja b/usr/lib/python2.7/dist-packages/salt/templates/virt/libvirt_domain.jinja
63 +--- a/usr/lib/python2.7/dist-packages/salt/templates/virt/libvirt_domain.jinja
64 ++++ b/usr/lib/python2.7/dist-packages/salt/templates/virt/libvirt_domain.jinja
66 + <vcpu>{{ cpu }}</vcpu>
67 + <memory unit='KiB'>{{ mem }}</memory>
69 ++ {% if custom_virt_machine %}
70 ++ <type machine='{{ virt_machine_model }}'>hvm</type>
74 ++ {% if os_loader_type == 'pflash' %}
75 ++ <loader readonly='yes' type='{{ os_loader_type }}'>{{ os_loader }}</loader>
76 ++ <nvram>{{ os_loader_nvram }}</nvram>
78 + {% for dev in boot_dev %}
79 + <boot dev='{{ dev }}' />
82 ++ {% if cpu_mode == 'custom' %}
83 ++ <cpu mode='{{ cpu_model }}' check='none'/>
86 + {% for diskname, disk in disks.items() %}
87 + <disk type='file' device='disk'>
88 diff --git a/mcp/salt-formulas/armband/libvirt_domain_template.sls b/mcp/salt-formulas/armband/libvirt_domain_template.sls
90 index 0000000..7cc8e22
92 +++ b/mcp/salt-formulas/armband/libvirt_domain_template.sls
94 +/usr/lib/python2.7/dist-packages/salt/templates/virt/libvirt_domain.jinja:
96 + - source: salt://armband/files/libvirt_domain.jinja.diff
97 + - hash: "9d02cd8aa04497c2d75c72840a5c6c41"