diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-12-30 11:27:42 +0100 |
|---|---|---|
| committer | Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2019-12-31 07:49:25 +0000 |
| commit | 172fa65b1b2b9cea3f15fcd65e00dafe7fe3f1b2 (patch) | |
| tree | 420bc6aa1f33ed4ae7b33ab9d9f15648bf8783d2 | |
| parent | d8f0a6b4fd9c3cb10780abcbd9b446c48b08cced (diff) | |
aarch64: Pin qemu-efi from Armband repos
Upstream (UCA) qemu-efi (AAVMF) package is incompatible
with most cloud images, e.g. Cirros used by Functest,
resulting in kernel boot issues and/or missing serial console
output.
Work around this by pinning the qemu-efi Debian package from
the old Armband repositories. This should fix singlevm1 functest
testcase.
Change-Id: Ibbe2218d99881f6fec89846497c2cc248aab5031
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
(cherry picked from commit 73656638216987cc4e9c75468182f16b82cce5d1)
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 | 11 | ||||
| -rw-r--r-- | mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 | 11 |
2 files changed, 18 insertions, 4 deletions
diff --git a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 index bdc23ff6a..a55485ea0 100644 --- a/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-ha/openstack_init.yml.j2 @@ -203,10 +203,17 @@ parameters: armband_3: # Should be in sync with the repo config generated via curtin/MaaS source: "deb http://linux.enea.com/mcp-repos/${_param:armband_repo_version}/xenial ${_param:armband_repo_version}-armband main" key: ${_param:armband_key} - pin: - - pin: 'release a=${_param:armband_repo_version}-armband' + pinning: + 15: + enabled: true + pin: 'release a=${_param:armband_repo_version}-armband' priority: 15 package: '*' + 1200: + enabled: true + pin: 'release a=${_param:armband_repo_version}-armband' + priority: 1200 + package: 'qemu-efi' {%- endif %} kernel: sysctl: diff --git a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 index 8fe37f9ef..61f222cb1 100644 --- a/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 +++ b/mcp/reclass/classes/cluster/mcp-common-noha/openstack_init.yml.j2 @@ -86,10 +86,17 @@ parameters: armband_3: # Should be in sync with the repo config generated via curtin/MaaS source: "deb http://linux.enea.com/mcp-repos/${_param:armband_repo_version}/xenial ${_param:armband_repo_version}-armband main" key: ${_param:armband_key} - pin: - - pin: 'release a=${_param:armband_repo_version}-armband' + pinning: + 15: + enabled: true + pin: 'release a=${_param:armband_repo_version}-armband' priority: 15 package: '*' + 1200: + enabled: true + pin: 'release a=${_param:armband_repo_version}-armband' + priority: 1200 + package: 'qemu-efi' {%- endif %} network: host: |