packages/ovirt-engine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix engine-setup problem

Browse Source 
(cherry picked from commit 6cb33f681d170f2bdd81106fda60fdcfc9b0e691)
This commit is contained in:
yanjianqing 2023-03-08 15:03:18 +08:00 committed by openeuler-sync-bot
parent 17b8bb2972
commit b07527fd32
2 changed files with 234 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

228
0009-fix-engine-setup-problem.patch Normal file
View File

@ -0,0 +1,228 @@
From ed6bf930fc3177f920908e2421adf980710ec57f Mon Sep 17 00:00:00 2001
From: Super User <root@localhost.localdomain>
Date: Wed, 8 Mar 2023 11:36:07 +0800
Subject: [PATCH] fix engine-setup problem
---
packaging/bin/engine-backup.sh.in | 3 ++-
packaging/setup/bin/ovirt-engine-upgrade-check.in | 6 ++----
.../setup/ovirt_engine_setup/engine_common/postgres.py | 6 ++----
.../ovirt-engine-common/base/core/offlinepackager.py | 6 ++----
.../ovirt-engine-common/core/offlinepackager.py | 6 ++----
.../ovirt-engine-common/dialog/titles.py | 6 ++----
.../ovirt-engine-common/distro-rpm/packages.py | 6 ++----
.../ovirt-engine-common/distro-rpm/versionlock_config.py | 7 ++++---
.../plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py | 6 ++----
9 files changed, 20 insertions(+), 32 deletions(-)
diff --git a/packaging/bin/engine-backup.sh.in b/packaging/bin/engine-backup.sh.in
index fd3151b..25120e8 100755
--- a/packaging/bin/engine-backup.sh.in
+++ b/packaging/bin/engine-backup.sh.in
@@ -994,7 +994,8 @@ dobackup() {
}
getOSVersion() {
- python@PY_VERSION@ -c 'import platform; d = platform.linux_distribution(full_distribution_name=0); print("%s%s" % (d[0], d[1].split(".")[0]))'
+# python@PY_VERSION@ -c 'import platform; d = platform.linux_distribution(full_distribution_name=0); print("%s%s" % (d[0], d[1].split(".")[0]))'
+ python@PY_VERSION@ -c 'import distro; print("%s%s" % (distro.id(), distrio.version().split(".")[0]))'
}
createtar() {
diff --git a/packaging/setup/bin/ovirt-engine-upgrade-check.in b/packaging/setup/bin/ovirt-engine-upgrade-check.in
index f357f01..2bae272 100755
--- a/packaging/setup/bin/ovirt-engine-upgrade-check.in
+++ b/packaging/setup/bin/ovirt-engine-upgrade-check.in
@@ -15,7 +15,7 @@ import platform
import optparse
import gettext
import glob
-
+import distro
from otopi import common
from otopi import constants as otopicons
@@ -118,9 +118,7 @@ def main():
setup_packages = get_setup_packages()
try:
- if platform.linux_distribution(
- full_distribution_name=0
- )[0] not in ('redhat', 'fedora', 'centos'):
+ if distro.id() not in ('redhat', 'fedora', 'centos','openeuler'):
raise RuntimeError(_('Unsupported distribution'))
exit = 1
diff --git a/packaging/setup/ovirt_engine_setup/engine_common/postgres.py b/packaging/setup/ovirt_engine_setup/engine_common/postgres.py
index 51c9c4b..bd8ba4b 100644
--- a/packaging/setup/ovirt_engine_setup/engine_common/postgres.py
+++ b/packaging/setup/ovirt_engine_setup/engine_common/postgres.py
@@ -15,7 +15,7 @@ import random
import re
import shutil
import time
-
+import distro
from otopi import base
from otopi import constants as otopicons
from otopi import filetransaction
@@ -449,9 +449,7 @@ class Provisioning(base.Base):
self.command.detect('psql')
def supported(self):
- return platform.linux_distribution(
- full_distribution_name=0
- )[0] in ('redhat', 'fedora', 'centos')
+ return distro.id() in ('redhat', 'fedora', 'centos','openeuler')
def validate(self):
if not self.services.exists(
diff --git a/packaging/setup/plugins/ovirt-engine-common/base/core/offlinepackager.py b/packaging/setup/plugins/ovirt-engine-common/base/core/offlinepackager.py
index 7108668..629930a 100644
--- a/packaging/setup/plugins/ovirt-engine-common/base/core/offlinepackager.py
+++ b/packaging/setup/plugins/ovirt-engine-common/base/core/offlinepackager.py
@@ -12,7 +12,7 @@
import gettext
import platform
-
+import distro
from otopi import constants as otopicons
from otopi import packager
from otopi import plugin
@@ -52,9 +52,7 @@ class Plugin(plugin.PluginBase, packager.PackagerBase):
def __init__(self, context):
super(Plugin, self).__init__(context=context)
- self._distribution = platform.linux_distribution(
- full_distribution_name=0
- )[0]
+ self._distribution = distro.id()
@plugin.event(
stage=plugin.Stages.STAGE_INIT,
diff --git a/packaging/setup/plugins/ovirt-engine-provisiondb/ovirt-engine-common/core/offlinepackager.py b/packaging/setup/plugins/ovirt-engine-provisiondb/ovirt-engine-common/core/offlinepackager.py
index 911357c..fbdfc98 100644
--- a/packaging/setup/plugins/ovirt-engine-provisiondb/ovirt-engine-common/core/offlinepackager.py
+++ b/packaging/setup/plugins/ovirt-engine-provisiondb/ovirt-engine-common/core/offlinepackager.py
@@ -14,7 +14,7 @@
import gettext
import platform
-
+import distro
from otopi import constants as otopicons
from otopi import packager
from otopi import plugin
@@ -54,9 +54,7 @@ class Plugin(plugin.PluginBase, packager.PackagerBase):
def __init__(self, context):
super(Plugin, self).__init__(context=context)
- self._distribution = platform.linux_distribution(
- full_distribution_name=0
- )[0]
+ self._distribution = distro.id()
@plugin.event(
stage=plugin.Stages.STAGE_INIT,
diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/dialog/titles.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/dialog/titles.py
index 5f8d02f..9cc2958 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/dialog/titles.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/dialog/titles.py
@@ -12,7 +12,7 @@
import gettext
import platform
-
+import distro
from otopi import plugin
from otopi import util
@@ -35,9 +35,7 @@ class Plugin(plugin.PluginBase):
def __init__(self, context):
super(Plugin, self).__init__(context=context)
- self._distribution = platform.linux_distribution(
- full_distribution_name=0
- )[0]
+ self._distribution = distro.id()
@plugin.event(
stage=plugin.Stages.STAGE_CUSTOMIZATION,
diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py
index 2987052..e7a29ef 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/packages.py
@@ -15,7 +15,7 @@ import datetime
import gettext
import os
import platform
-
+import distro
from otopi import constants as otopicons
from otopi import plugin
from otopi import transaction
@@ -266,9 +266,7 @@ class Plugin(plugin.PluginBase):
super(Plugin, self).__init__(context=context)
self._shouldResultVersionLock = False
self._enabled = False
- self._distribution = platform.linux_distribution(
- full_distribution_name=0
- )[0]
+ self._distribution = distro.id()
@plugin.event(
stage=plugin.Stages.STAGE_INIT,
diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/versionlock_config.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/versionlock_config.py
index 7e9fd9b..47b1f09 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/versionlock_config.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine-common/distro-rpm/versionlock_config.py
@@ -12,7 +12,7 @@
import os
import platform
-
+import distro
from otopi import constants as otopicons
from otopi import filetransaction
from otopi import plugin
@@ -40,9 +40,10 @@ class Plugin(plugin.PluginBase):
os.path.exists(YUM_VERSIONLOCK_CONF) and
not self.environment[osetupcons.CoreEnv.DEVELOPER_MODE] and
not self.environment[osetupcons.CoreEnv.OFFLINE_PACKAGER] and
- platform.linux_distribution(full_distribution_name=0)[0] in (
+ distro.id() in (
'redhat',
- 'centos'
+ 'centos',
+ 'openeuler'
)
)
)
diff --git a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py
index a09934d..e43a771 100644
--- a/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py
+++ b/packaging/setup/plugins/ovirt-engine-setup/ovirt-engine/system/nfs.py
@@ -15,7 +15,7 @@ NFS and RPCbind services configuration plugin.
import gettext
import os
import platform
-
+import distro
from otopi import constants as otopicons
from otopi import filetransaction
from otopi import plugin
@@ -47,9 +47,7 @@ class Plugin(plugin.PluginBase):
def __init__(self, context):
super(Plugin, self).__init__(context=context)
- self._distribution = platform.linux_distribution(
- full_distribution_name=0
- )[0]
+ self._distribution = distro.id()
@plugin.event(
stage=plugin.Stages.STAGE_INIT,
--
2.39.1

7
ovirt-engine.spec
View File

@ -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: 6
Release: 7
Summary: Management server for Open Virtualization
Group: %{ovirt_product_group}
License: Apache 2.0
@ -198,6 +198,7 @@ Patch5: 0005-fix-interface-report-an-error-when-emulatedMachine-is-null.
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
BuildArch: noarch
BuildRequires: assertj-core >= 2.2.0
@ -647,6 +648,7 @@ Setup imageio service.
%patch6 -p1
%patch7 -p1
%patch8 -p1
%patch9 -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
@ -1295,6 +1297,9 @@ fi
%{engine_data}/setup/bin/ovirt-engine-health
%changelog
* Wed Mar 08 2023 yanjianqing <yanjianqing@kylinos.cn> - 4.4.4.1-7
- Fix engine-setup problem
* Fri Mar 03 2023 jiangxinyu <jiangxinyu@kylinos.cn> - 4.4.4.1-6
- Remove OVN/OVS support