diff options
| author |   Charalampos Kominos <Charalampos.Kominos@enea.com> | 2017-09-18 16:20:09 +0200 |
|---|---|---|
| committer |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2017-09-18 17:41:33 +0000 |
| commit | e83bf78c4a0a90f242569f85a7c90ea1771b5d9c (patch) | |
| tree | 941fa6ab419515621dca7cfadf3e4648a8d7b140 /patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch | |
| parent | 4581e4c350bbeee71e6cf570b61c98bf3fa286c7 (diff) | |
p/fuel: edit libvirt.py with correct arch values
On AArch64 systems, ACPI should only be added to the domain XML
by nova via libvirt driver when guest UEFI (AAVMF) is used.
Change-Id: I462303b196366ddaa132b2a2ed6fe4af0e8e5f95
(cherry picked from commit 0ced943988c95f9e033dd5d14cfe54870c50fa04)
Diffstat (limited to 'patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch')
| -rw-r--r-- | patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch index be6455aa..117c81df 100644 --- a/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch +++ b/patches/opnfv-fuel/0001-mcp-salt-formulas-Add-enable-armband-formula.patch @@ -60,17 +60,17 @@ index 0d733ba..bfedbae 100755 salt -C '* and not cfg01* and not mas01*' state.apply salt diff --git a/mcp/config/states/openstack b/mcp/config/states/openstack -index eaab135..050b648 100755 +index beb6abb..885f2ac 100755 --- a/mcp/config/states/openstack +++ b/mcp/config/states/openstack -@@ -31,3 +31,5 @@ salt -I 'ceilometer:server' state.sls ceilometer +@@ -35,3 +35,5 @@ salt -I 'ceilometer:server' state.sls ceilometer salt -I 'ceilometer:agent' state.sls ceilometer salt -I 'horizon:server' state.sls horizon + +salt -I 'nova:compute' state.sls armband diff --git a/mcp/config/states/openstack_ha b/mcp/config/states/openstack_ha -index 8ca76e4..c0b8ee3 100755 +index 78da80a..dcceb02 100755 --- a/mcp/config/states/openstack_ha +++ b/mcp/config/states/openstack_ha @@ -41,6 +41,7 @@ salt -I 'neutron:server' state.sls neutron -b 1 @@ -137,7 +137,7 @@ index 0000000..a5b08da + video.type = 'vga' diff --git a/mcp/salt-formulas/armband/files/nova-libvirt-AArch64-ACPI-depends-on-AAVMF.diff b/mcp/salt-formulas/armband/files/nova-libvirt-AArch64-ACPI-depends-on-AAVMF.diff new file mode 100644 -index 0000000..bc3121f +index 0000000..7c1b78a --- /dev/null +++ b/mcp/salt-formulas/armband/files/nova-libvirt-AArch64-ACPI-depends-on-AAVMF.diff @@ -0,0 +1,45 @@ @@ -171,7 +171,7 @@ index 0000000..bc3121f + (virt_type == "xen" and guest.os_type == fields.VMMode.HVM)): +- guest.features.append(vconfig.LibvirtConfigGuestFeatureACPI()) ++ guestarch = libvirt_utils.get_arch(image_meta) -++ if (guestarch not in (arch.ARMV7, arch.AARCH64) or +++ if (guestarch not in (fields.Architecture.ARMV7, fields.Architecture.AARCH64) or ++ image_meta.properties.get('hw_firmware_type') == 'uefi'): ++ guest.features.append(vconfig.LibvirtConfigGuestFeatureACPI()) + guest.features.append(vconfig.LibvirtConfigGuestFeatureAPIC()) |