diff --git a/0010-fix-host-installation-failure.patch b/0010-fix-host-installation-failure.patch new file mode 100644 index 0000000..70dd3c4 --- /dev/null +++ b/0010-fix-host-installation-failure.patch @@ -0,0 +1,43 @@ +From 388c9a082697d1c736ad74d983671a85699c133d Mon Sep 17 00:00:00 2001 +From: wangdi +Date: Tue, 14 Mar 2023 10:12:57 +0800 +Subject: [PATCH] fix host installation failure + +--- + .../project/roles/ovirt-host-deploy-facts/tasks/host-os.yml | 2 +- + .../plugins/ovirt-engine-setup/ovirt-engine/apache/runner.py | 3 ++- + 2 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-facts/tasks/host-os.yml b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-facts/tasks/host-os.yml +index ef92743..f45415a 100644 +--- a/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-facts/tasks/host-os.yml ++++ b/packaging/ansible-runner-service-project/project/roles/ovirt-host-deploy-facts/tasks/host-os.yml +@@ -10,7 +10,7 @@ + + - name: Check if system is OpenEuler + set_fact: +- ansible_python_interpreter: "{{ 'usr/bin/python3' }}" ++ ansible_python_interpreter: "{{ '/usr/bin/python3' }}" + when: + ansible_distribution == 'openEuler' + +diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/runner.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/runner.py +index 8a8be55..2b3c3a1 100644 +--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/runner.py ++++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/apache/runner.py +@@ -82,10 +82,11 @@ class Plugin(plugin.PluginBase): + ), + content=textwrap.dedent(''' + Listen {port} ++ WSGIRestrictEmbedded On + + WSGIDaemonProcess runner user={user} group={group} threads=4 + WSGIProcessGroup runner +- WSGIScriptAlias / {runner_wsgi_file} ++ WSGIScriptAlias / {runner_wsgi_file} process-group=runner application-group=%{{GLOBAL}} + + ''').format( + runner_wsgi_file=runner_wsgi_file, +-- +2.39.1 + diff --git a/ovirt-engine.spec b/ovirt-engine.spec index 612832e..9d34a4d 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: 7 +Release: 8 Summary: Management server for Open Virtualization Group: %{ovirt_product_group} License: Apache 2.0 @@ -199,6 +199,7 @@ Patch6: 0007-add-config-item-for-openeuler.patch 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 BuildArch: noarch BuildRequires: assertj-core >= 2.2.0 @@ -649,6 +650,7 @@ Setup imageio service. %patch7 -p1 %patch8 -p1 %patch9 -p1 +%patch10 -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 @@ -1297,6 +1299,9 @@ fi %{engine_data}/setup/bin/ovirt-engine-health %changelog +* Tue Mar 14 2023 wangdi - 4.4.4.1-8 +- Fix host installation failure + * Wed Mar 08 2023 yanjianqing - 4.4.4.1-7 - Fix engine-setup problem