Modify install require version and add confit item for openeuler
This commit is contained in:
wang--ge
parent
43451832d9
commit
571568e92f
38
0007-add-config-item-for-openeuler.patch
Normal file
38
0007-add-config-item-for-openeuler.patch
Normal file
@ -0,0 +1,38 @@
|
||||
From f7411c6c0795c0936ae59a4fab6c04d74da2d2bc Mon Sep 17 00:00:00 2001
|
||||
From: wang--ge <wang__ge@126.com>
|
||||
Date: Tue, 16 Nov 2021 09:19:20 +0800
|
||||
Subject: [PATCH] add config item for openeuler
|
||||
|
||||
---
|
||||
.../roles/ovirt-host-deploy-facts/tasks/host-os.yml | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
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 7e42653..ef92743 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
|
||||
@@ -5,9 +5,15 @@
|
||||
if ansible_distribution == 'RedHat' or ansible_distribution == 'CentOS'
|
||||
else 0 }}"
|
||||
fc_ver: "{{ ansible_distribution_major_version|int
|
||||
- if ansible_distribution == 'Fedora'
|
||||
+ if (ansible_distribution == 'Fedora' or ansible_distribution == 'openEuler')
|
||||
else 0 }}"
|
||||
|
||||
+- name: Check if system is OpenEuler
|
||||
+ set_fact:
|
||||
+ ansible_python_interpreter: "{{ 'usr/bin/python3' }}"
|
||||
+ when:
|
||||
+ ansible_distribution == 'openEuler'
|
||||
+
|
||||
- name: Fetch installed packages
|
||||
package_facts:
|
||||
manager: auto
|
||||
@@ -26,3 +32,4 @@
|
||||
- name: Detect if host is a prebuilt image
|
||||
set_fact:
|
||||
node_host: "{{ not node_presence.changed }}"
|
||||
+
|
||||
--
|
||||
2.27.0
|
||||
|
||||
@ -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: 2
|
||||
Release: 3
|
||||
Summary: Management server for Open Virtualization
|
||||
Group: %{ovirt_product_group}
|
||||
License: Apache 2.0
|
||||
@ -195,6 +195,7 @@ Patch2: 0002-add-support-running-on-kunpeng-platform.patch
|
||||
Patch3: 0003-add-virt-chipset-support.patch
|
||||
Patch4: 0004-fit-cluster-can-not-find-error-under-aarch64-platform.patch
|
||||
Patch5: 0005-fix-interface-report-an-error-when-emulatedMachine-is-null.patch
|
||||
Patch6: 0007-add-config-item-for-openeuler.patch
|
||||
BuildArch: noarch
|
||||
|
||||
BuildRequires: assertj-core >= 2.2.0
|
||||
@ -211,8 +212,9 @@ BuildRequires: javapackages-local
|
||||
|
||||
Requires(pre): shadow-utils
|
||||
|
||||
Requires: ovirt-engine-wildfly-overlay >= 18
|
||||
Requires: ovirt-engine-wildfly-overlay = 19.1.0
|
||||
Requires: ansible-2.9
|
||||
Requires: sudo >= 1.9.2
|
||||
|
||||
Requires: %{name}-backend = %{version}-%{release}
|
||||
Requires: %{name}-dbscripts = %{version}-%{release}
|
||||
@ -357,8 +359,9 @@ Requires: mailcap
|
||||
Requires: mod_ssl
|
||||
Requires: novnc >= 1.0.0
|
||||
Requires: python3-%{name}-lib >= %{version}-%{release}
|
||||
Requires: openssh
|
||||
Requires: openssh >= 8.2p1
|
||||
Requires: vdsm-jsonrpc-java >= 1.5.4
|
||||
Conflicts: vdsm-jsonrpm-java >= 1.6
|
||||
Requires: java-client-kubevirt >= 0.5.0
|
||||
Requires: openssl
|
||||
Requires: ovirt-engine-extension-aaa-jdbc >= 1.2.0
|
||||
@ -445,7 +448,7 @@ Requires: %{name}-setup-plugin-cinderlib = %{version}-%{release}
|
||||
Requires: %{name}-setup-plugin-imageio = %{version}-%{release}
|
||||
Requires: %{name}-dwh-setup >= 4.4.1.2
|
||||
Requires: ovirt-engine-extension-aaa-jdbc >= 1.2.0
|
||||
Requires: openssh
|
||||
Requires: openssh >= 8.2p1
|
||||
Requires: postgresql-13-server
|
||||
Requires: postgresql-13-contrib
|
||||
Conflicts: %{name} < 4.4.0
|
||||
@ -608,7 +611,7 @@ with ovirt-vmconsole-proxy package
|
||||
Summary: Setup and upgrade specific plugins for vmconsole-proxy-helper
|
||||
Requires: %{name}-setup-plugin-ovirt-engine = %{version}-%{release}
|
||||
Requires: %{name}-setup-plugin-ovirt-engine-common = %{version}-%{release}
|
||||
Requires: openssh
|
||||
Requires: openssh >= 8.2p1
|
||||
|
||||
%description setup-plugin-vmconsole-proxy-helper
|
||||
Setup and upgrade specific plugins for vmconsole-proxy-helper
|
||||
@ -627,7 +630,7 @@ A utility for creating a bundle script that runs a health check.
|
||||
Summary: Setup and upgrade specific plugins for cinderlib integration database
|
||||
Requires: %{name}-setup-plugin-ovirt-engine = %{version}-%{release}
|
||||
Requires: %{name}-setup-plugin-ovirt-engine-common = %{version}-%{release}
|
||||
Requires: openssh
|
||||
Requires: openssh >= 8.2p1
|
||||
|
||||
%description setup-plugin-cinderlib
|
||||
Setup and upgrade specific plugins for cinderlib integration database
|
||||
@ -649,6 +652,7 @@ Setup imageio service.
|
||||
%patch3 -p1
|
||||
%patch4 -p1
|
||||
%patch5 -p1
|
||||
%patch6 -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
|
||||
@ -681,7 +685,9 @@ sed -i 's/require=\"10240\";/require=\"1024\";/g' Makefile
|
||||
sed -i 's/MAVEN_OPTS=\"/MAVEN_OPTS=\"-Xmx16384m -Xms16384m /g' Makefile
|
||||
sed -i 's/$(BUILD_FLAGS) \\/-Dgwt.compiler.localWorkers=2 $(BUILD_FLAGS) \\/g' Makefile
|
||||
sed -i 's/BUILD_ALL_USER_AGENTS=0/BUILD_ALL_USER_AGENTS=1/g' Makefile
|
||||
sed -i "s/'centos'/'centos', 'openEuler'/g" packaging/setup/ovirt_engine_setup/engine_common/postgres.py
|
||||
sed -i "s/import platform/import distro/g" packaging/setup/ovirt_engine_setup/engine_common/postgres.py
|
||||
sed -i "s/platform.linux_distribution/distro.linux_distribution/g" packaging/setup/ovirt_engine_setup/engine_common/postgres.py
|
||||
sed -i "s/'centos'/'centos', 'openeuler'/g" packaging/setup/ovirt_engine_setup/engine_common/postgres.py
|
||||
sed -i "s/BUILD_LOCALES=0/BUILD_LOCALES=1/g" automation/build-artifacts.sh
|
||||
sed -i "s/BUILD_LOCALES=0/BUILD_LOCALES=1/g" Makefile
|
||||
sed -i '/slf4j/a\ <module name="com.fasterxml.jackson.core.jackson-databind"/>' backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
|
||||
@ -1296,6 +1302,9 @@ fi
|
||||
%{engine_data}/setup/bin/ovirt-engine-health
|
||||
|
||||
%changelog
|
||||
* Tue Nov 16 2021 Ge Wang <wangge20@huawei.com> - 4.4.4.1-3
|
||||
- Modify install require version and add confit item for openeuler
|
||||
|
||||
* Wed Oct 13 2021 Ge Wang <wangge20@huawei.com> - 4.4.4.1-2
|
||||
- Fix interface report error when emulatedMachine is null
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user