From 41c5b5275170fbe35e1c74e71e6d07e34a32ae91 Mon Sep 17 00:00:00 2001 From: wangdi Date: Tue, 14 Mar 2023 17:18:35 +0800 Subject: [PATCH] Set vdsm id as system uuid from dmidecode on aarch64 --- ...rom-dmidecode-system-uuid-on-aarch64.patch | 41 +++++++++++++++++++ ovirt-engine.spec | 7 +++- 2 files changed, 47 insertions(+), 1 deletion(-) create mode 100644 0011-get-vdsm-id-from-dmidecode-system-uuid-on-aarch64.patch diff --git a/0011-get-vdsm-id-from-dmidecode-system-uuid-on-aarch64.patch b/0011-get-vdsm-id-from-dmidecode-system-uuid-on-aarch64.patch new file mode 100644 index 0000000..2d74778 --- /dev/null +++ b/0011-get-vdsm-id-from-dmidecode-system-uuid-on-aarch64.patch @@ -0,0 +1,41 @@ +From a8dd9ed10a3f272c4ba8c5f619c66eaf243e7112 Mon Sep 17 00:00:00 2001 +From: wangdi +Date: Tue, 14 Mar 2023 17:11:34 +0800 +Subject: [PATCH] get vdsm id from dmidecode system-uuid on aarch64 + +--- + .../project/roles/ovirt-host-deploy-vdsm/tasks/vdsmid.yml | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vdsm/tasks/vdsmid.yml b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vdsm/tasks/vdsmid.yml +index 87c7d87..c3612b9 100644 +--- a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vdsm/tasks/vdsmid.yml ++++ b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-vdsm/tasks/vdsmid.yml +@@ -23,13 +23,13 @@ + name: dmidecode + state: present + +- - name: Detect vdsm id for x86_64 or i686 ++ - name: Detect vdsm id for x86_64 or i686 or aarch64 + shell: dmidecode -s system-uuid + register: vdsm_id_res + tags: + - skip_ansible_lint # E305 + +- - name: Set vdsm id for x86_64 or i686 ++ - name: Set vdsm id for x86_64 or i686 or aarch64 + set_fact: + vdsm_id: "{{ vdsm_id_res.stdout }}" + when: +@@ -39,7 +39,7 @@ + when: + - not vdsm_id_stat.stat.exists + - not vdsm_id +- - (ansible_facts.architecture == 'x86_64' or ansible_facts.architecture == 'i686') ++ - (ansible_facts.architecture == 'x86_64' or ansible_facts.architecture == 'i686' or ansible_facts.architecture == 'aarch64') + + - block: + - name: Verify ppc system id path exists +-- +2.39.1 + diff --git a/ovirt-engine.spec b/ovirt-engine.spec index 9d34a4d..3c3dd11 100644 --- a/ovirt-engine.spec +++ b/ovirt-engine.spec @@ -176,7 +176,7 @@ getent passwd %1 >/dev/null || useradd -r -u %2 -g %3 -c %5 -s /sbin/nologin -d Name: ovirt-engine Version: 4.4.4.1 -Release: 8 +Release: 9 Summary: Management server for Open Virtualization Group: %{ovirt_product_group} License: Apache 2.0 @@ -200,6 +200,7 @@ Patch7: CVE-2020-10775.patch Patch8: 0008-modify-sshd-core-version.patch Patch9: 0009-fix-engine-setup-problem.patch Patch10: 0010-fix-host-installation-failure.patch +Patch11: 0011-get-vdsm-id-from-dmidecode-system-uuid-on-aarch64.patch BuildArch: noarch BuildRequires: assertj-core >= 2.2.0 @@ -651,6 +652,7 @@ Setup imageio service. %patch8 -p1 %patch9 -p1 %patch10 -p1 +%patch11 -p1 sed -i '87s/@Test/\/\/@Test/g' backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilderTest.java sed -i '88s/@MockedConfig/\/\/@MockedConfig/g' backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilderTest.java sed -i '121s/@Test/\/\/@Test/g' backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddClusterCommandTest.java @@ -1299,6 +1301,9 @@ fi %{engine_data}/setup/bin/ovirt-engine-health %changelog +* Tue Mar 14 2023 wangdi - 4.4.4.1-9 +- Set vdsm id as system uuid from dmidecode on aarch64 + * Tue Mar 14 2023 wangdi - 4.4.4.1-8 - Fix host installation failure