1 ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::
2 : Copyright (c) 2018 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: Guillermo Herrero <Guillermo.Herrero@enea.com>
10 Date: Tue, 25 Jul 2017 00:58:32 +0200
11 Subject: [PATCH] salt-formulas: Add & enable armband formula
13 - prereq: install qemu-efi;
14 - prereq: install vgabios;
15 - prereq: fix missing link for vgabios binary blob;
16 - nova conf: cpu_model=cortex-a57 (only for virtual deploys);
17 - nova conf: virt_type=qemu (only for virtual deploys);
18 - nova compute conf: virt_type=qemu (only for virtual deploys);
19 - nova conf: pointer_model=ps2mouse since AArch64 has no USB tablet;
21 [1] https://github.com/openstack/nova/commit/f0f0953
23 Signed-off-by: Guillermo Herrero <Guillermo.Herrero@enea.com>
24 Signed-off-by: Charalampos Kominos <Charalampos.Kominos@enea.com>
25 Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
27 mcp/config/states/openstack_ha | 1 +
28 mcp/config/states/openstack_noha | 2 ++
29 mcp/config/states/virtual_control_plane | 1 +
30 .../armband/files/nova-libvirt-aarch64-rollup.diff | 27 +++++++++++++++++
31 mcp/salt-formulas/armband/init.sls | 7 +++++
32 mcp/salt-formulas/armband/nova_config.sls | 35 ++++++++++++++++++++++
33 mcp/salt-formulas/armband/nova_libvirt.sls | 7 +++++
34 mcp/salt-formulas/armband/qemu_efi.sls | 2 ++
35 mcp/salt-formulas/armband/vgabios.sls | 7 +++++
36 9 files changed, 89 insertions(+)
37 create mode 100644 mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
38 create mode 100644 mcp/salt-formulas/armband/init.sls
39 create mode 100644 mcp/salt-formulas/armband/nova_config.sls
40 create mode 100644 mcp/salt-formulas/armband/nova_libvirt.sls
41 create mode 100644 mcp/salt-formulas/armband/qemu_efi.sls
42 create mode 100644 mcp/salt-formulas/armband/vgabios.sls
44 diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha
45 index d7d8cbd4..73c74ee0 100755
46 --- a/mcp/config/states/openstack_ha
47 +++ b/mcp/config/states/openstack_ha
48 @@ -56,6 +56,7 @@ if salt 'cmp*' match.pillar 'neutron:compute:backend:engine:ovn' \
51 salt -I 'nova:compute' state.sls nova
52 +wait_for 5.0 "salt -I 'nova:compute' state.sls armband"
54 salt -I 'barbican:server' state.sls barbican -b 1
55 salt -I 'barbican:client' state.sls barbican
56 diff --git a/mcp/config/states/openstack_noha b/mcp/config/states/openstack_noha
57 index 9a42d481..9ca32d0f 100755
58 --- a/mcp/config/states/openstack_noha
59 +++ b/mcp/config/states/openstack_noha
60 @@ -57,3 +57,5 @@ salt -I 'ceilometer:server' state.sls ceilometer
61 salt -I 'ceilometer:agent' state.sls ceilometer
63 salt -I 'horizon:server' state.sls apache,horizon
65 +salt -I 'nova:compute' state.sls armband
66 diff --git a/mcp/config/states/virtual_control_plane b/mcp/config/states/virtual_control_plane
67 index 8ea5047a..f8ef86b3 100755
68 --- a/mcp/config/states/virtual_control_plane
69 +++ b/mcp/config/states/virtual_control_plane
70 @@ -27,6 +27,7 @@ if [ "${ERASE_ENV}" -eq 1 ]; then
73 # KVM libvirt first, VCP deployment
74 +wait_for 5.0 "salt -C 'kvm*' state.sls armband"
75 wait_for 5.0 "salt -C 'kvm*' state.sls libvirt"
77 salt -C 'kvm* or cmp*' state.apply salt
78 diff --git a/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff b/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
80 index 00000000..1ecbf297
82 +++ b/mcp/salt-formulas/armband/files/nova-libvirt-aarch64-rollup.diff
84 +From: Charalampos Kominos <Charalampos.Kominos@enea.com>
85 +Date: Wed, 2 May 2018 14:20:47 +0200
86 +Subject: [PATCH] Allow libvirt to honor root device naming
88 +Current behaviour in upstream nova is for rootfs to be in /dev/vda
89 +which is the default behaviour when using virtio driver. However when
90 +other devices are requested either by glance or by CLI, nova ignores
91 +that naming and still tries to attach to vda which fails.
93 +Manually applied in https://review.openstack.org/#/c/214314/
97 +Signed-off-by: Charalampos Kominos <charalampos.kominos@enea.com>
100 +--- a/nova/virt/libvirt/driver.py
101 ++++ b/nova/virt/libvirt/driver.py
102 +@@ -8257,6 +8257,8 @@
103 + "Ignoring supplied device name: %(device_name)s. "
104 + "Libvirt can't honour user-supplied dev names",
105 + {'device_name': bdm.device_name}, instance=instance)
106 ++ if instance.root_device_name == bdm.device_name:
107 ++ instance.root_device_name = None
108 + bdm.device_name = None
109 + block_device_info = driver.get_block_device_info(instance,
110 + block_device_mapping)
111 diff --git a/mcp/salt-formulas/armband/init.sls b/mcp/salt-formulas/armband/init.sls
113 index 00000000..8a8cf2ab
115 +++ b/mcp/salt-formulas/armband/init.sls
120 + {%- if salt['pkg.version']('python-nova') %}
121 + - armband.nova_libvirt
122 + - armband.nova_config
124 diff --git a/mcp/salt-formulas/armband/nova_config.sls b/mcp/salt-formulas/armband/nova_config.sls
126 index 00000000..31fa031a
128 +++ b/mcp/salt-formulas/armband/nova_config.sls
130 +{% if grains['virtual'] == 'kvm' %}
133 + - name: "/etc/nova/nova.conf"
134 + - pattern: '^virt_type\s*=.*$'
135 + - repl: "virt_type = qemu"
136 +nova_compute_virt_type:
138 + - name: "/etc/nova/nova-compute.conf"
139 + - pattern: '^virt_type\s*=.*$'
140 + - repl: "virt_type = qemu"
144 + - name: "/etc/nova/nova.conf"
145 + - pattern: '^#pointer_model\s*=.*$'
146 + - repl: "pointer_model = ps2mouse"
149 + - name: "/etc/nova/nova.conf"
150 + - pattern: '^cpu_mode\s*=\s*host-passthrough'
151 + - repl: "cpu_mode = custom"
154 + - name: "/etc/nova/nova.conf"
155 + - pattern: '^#cpu_model\s*=.*$'
156 + {% if grains['virtual'] == 'kvm' %}
157 + - repl: "cpu_model = cortex-a57"
159 + - repl: "cpu_model = host"
161 +restart_nova-compute:
164 + - name: "service nova-compute restart"
165 diff --git a/mcp/salt-formulas/armband/nova_libvirt.sls b/mcp/salt-formulas/armband/nova_libvirt.sls
167 index 00000000..ff93db80
169 +++ b/mcp/salt-formulas/armband/nova_libvirt.sls
171 +nova-libvirt-aarch64-rollup:
173 + - name: /usr/lib/python2.7/dist-packages
174 + - source: salt://armband/files/nova-libvirt-aarch64-rollup.diff
177 + - unless: 'test -f /var/cache/salt/minion/files/base/armband/files/nova-libvirt-aarch64-rollup.diff && cd /usr/lib/python2.7/dist-packages && patch -p1 -R --dry-run -r - < /var/cache/salt/minion/files/base/armband/files/nova-libvirt-aarch64-rollup.diff'
178 diff --git a/mcp/salt-formulas/armband/qemu_efi.sls b/mcp/salt-formulas/armband/qemu_efi.sls
180 index 00000000..c697dae9
182 +++ b/mcp/salt-formulas/armband/qemu_efi.sls
186 diff --git a/mcp/salt-formulas/armband/vgabios.sls b/mcp/salt-formulas/armband/vgabios.sls
188 index 00000000..500c2bcf
190 +++ b/mcp/salt-formulas/armband/vgabios.sls
196 +/usr/share/qemu/vgabios-stdvga.bin:
198 + - target: "/usr/share/vgabios/vgabios.bin"