1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
2 : Copyright (c) 2017 Enea AB and others.
4 : All rights reserved. This program and the accompanying materials
5 : are made available under the terms of the Apache License, Version 2.0
6 : which accompanies this distribution, and is available at
7 : http://www.apache.org/licenses/LICENSE-2.0
8 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
9 From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
10 Date: Sun, 20 Aug 2017 22:41:26 +0200
11 Subject: [PATCH] mcp: salt-formulas: armband: Extend libvirt_domain
13 Add new state in armband salt formula that extends salt's virt
14 libvirt_domain.jinja template with support for:
19 These will later be leveraged via salt virt formula with AArch64
22 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
24 mcp/config/states/maas | 2 +-
25 .../armband/files/libvirt_domain.jinja.diff | 46 ++++++++++++++++++++++
26 .../armband/libvirt_domain_template.sls | 4 ++
27 3 files changed, 51 insertions(+), 1 deletion(-)
28 create mode 100644 mcp/salt-formulas/armband/files/libvirt_domain.jinja.diff
29 create mode 100644 mcp/salt-formulas/armband/libvirt_domain_template.sls
31 diff --git a/mcp/config/states/maas b/mcp/config/states/maas
32 index 787d713..633f544 100755
33 --- a/mcp/config/states/maas
34 +++ b/mcp/config/states/maas
35 @@ -81,7 +81,7 @@ wait_for 90 "! salt 'kvm*' test.ping | tee /dev/stderr | fgrep -q 'Not connected
37 salt -C '* and not cfg01* and not mas01*' state.apply linux,ntp
39 -salt -C 'kvm*' state.sls armband
40 +salt -C 'kvm*' state.sls armband,armband.libvirt_domain_template
41 salt -C 'kvm*' state.sls libvirt
43 salt -C '* and not cfg01* and not mas01*' state.apply salt
44 diff --git a/mcp/salt-formulas/armband/files/libvirt_domain.jinja.diff b/mcp/salt-formulas/armband/files/libvirt_domain.jinja.diff
46 index 0000000..4e7fad5
48 +++ b/mcp/salt-formulas/armband/files/libvirt_domain.jinja.diff
50 +From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
51 +Date: Sun Aug 20 18:18:53 2017 +0200
52 +Subject: [PATCH] libvirt_domain.jinja: Add AArch64 support
54 +Salt virt state relies on a Jinja template to create a libvirt
55 +XML definition for each new VM.
56 +This template needs to be extended with a few specific options
58 +- UEFI loader support (pflash);
59 +- custom machine model (e.g. 'virt-2.9'), since AArch64 defaults to
63 +Allow all these to be parametrized from the salt virt formula,
64 +which we will also adapt to allow the params to be passed via our
67 +Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
70 +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
71 +--- a/usr/lib/python2.7/dist-packages/salt/templates/virt/libvirt_domain.jinja
72 ++++ b/usr/lib/python2.7/dist-packages/salt/templates/virt/libvirt_domain.jinja
74 + <vcpu>{{ cpu }}</vcpu>
75 + <memory unit='KiB'>{{ mem }}</memory>
77 ++ {% if custom_virt_machine %}
78 ++ <type machine='{{ virt_machine_model }}'>hvm</type>
82 ++ {% if os_loader_type == 'pflash' %}
83 ++ <loader readonly='yes' type='{{ os_loader_type }}'>{{ os_loader }}</loader>
84 ++ <nvram>{{ os_loader_nvram }}</nvram>
86 + {% for dev in boot_dev %}
87 + <boot dev='{{ dev }}' />
90 ++ {% if cpu_mode == 'custom' %}
91 ++ <cpu mode='{{ cpu_model }}' check='none'/>
94 + {% for diskname, disk in disks.items() %}
95 + <disk type='file' device='disk'>
96 diff --git a/mcp/salt-formulas/armband/libvirt_domain_template.sls b/mcp/salt-formulas/armband/libvirt_domain_template.sls
98 index 0000000..7cc8e22
100 +++ b/mcp/salt-formulas/armband/libvirt_domain_template.sls
102 +/usr/lib/python2.7/dist-packages/salt/templates/virt/libvirt_domain.jinja:
104 + - source: salt://armband/files/libvirt_domain.jinja.diff
105 + - hash: "9d02cd8aa04497c2d75c72840a5c6c41"