Merge branch 'helix' into 'master'

gitlab · gitlab · commit 2c1a0d8838f2 · 2023-06-06T15:59:25.000+08:00
Helix feature

See merge request zstackio/zstack-utility!3280
diff --git a/appbuildsystem/ansible/appbuild.py b/appbuildsystem/ansible/appbuild.py
@@ -54,6 +54,7 @@
 
 # include zstacklib.py
 host_info = get_remote_host_info_obj(host_post_info)
+host_info = upgrade_to_helix(host_info, host_post_info)
 releasever = get_host_releasever(host_info)
 host_post_info.releasever = releasever
 
diff --git a/appliancevm/ansible/appliancevm.py b/appliancevm/ansible/appliancevm.py
@@ -52,9 +52,9 @@
 host_post_info.remote_port = remote_port
 if remote_pass is not None and remote_user != 'root':
     host_post_info.become = True
-
 # include zstacklib.py
 host_info = get_remote_host_info_obj(host_post_info)
+host_info = upgrade_to_helix(host_info, host_post_info)
 releasever = get_host_releasever(host_info)
 host_post_info.releasever = releasever
 
diff --git a/baremetalpxeserver/ansible/baremetalpxeserver.py b/baremetalpxeserver/ansible/baremetalpxeserver.py
@@ -57,9 +57,9 @@
 host_post_info.remote_port = remote_port
 if remote_pass is not None and remote_user != 'root':
     host_post_info.become = True
-
 # include zstacklib.py
 host_info = get_remote_host_info_obj(host_post_info)
+host_info = upgrade_to_helix(host_info, host_post_info)
 releasever = get_host_releasever(host_info)
 host_post_info.releasever = releasever
 
@@ -127,7 +127,7 @@
 
 # name: check and mount /opt/zstack-dvd
 command = """
-archRelease='x86_64/c72 x86_64/c74 x86_64/c76 x86_64/c79 x86_64/ky10sp1 x86_64/ky10sp2 x86_64/ky10sp3 aarch64/ky10sp1 aarch64/ky10sp2 aarch64/ky10sp3 mips64el/ky10sp1 loongarch64/ky10sp1 loongarch64/ky10sp3' 
+archRelease='x86_64/c72 x86_64/c74 x86_64/c76 x86_64/c79 x86_64/h76c x86_64/h79c x86_64/ky10sp1 x86_64/ky10sp2 x86_64/ky10sp3 aarch64/ky10sp1 aarch64/ky10sp2 aarch64/ky10sp3 mips64el/ky10sp1 loongarch64/ky10sp1 loongarch64/ky10sp3' 
 mkdir -p /var/lib/zstack/baremetal/{dnsmasq,ftp/{ks,zstack-dvd/{x86_64,aarch64,mips64el,loongarch64},scripts},tftpboot/{zstack/{x86_64,aarch64,mips64el,loongarch64},pxelinux.cfg,EFI/BOOT},vsftpd} /var/log/zstack/baremetal/;
 rm -rf /var/lib/zstack/baremetal/tftpboot/{grubaa64.efi,grub.cfg-01-*};
 is_repo_exist='false'
diff --git a/cephbackupstorage/ansible/cephb.py b/cephbackupstorage/ansible/cephb.py
@@ -58,9 +58,9 @@
 host_post_info.remote_port = remote_port
 if remote_pass is not None and remote_user != 'root':
     host_post_info.become = True
-
 # include zstacklib.py
 host_info = get_remote_host_info_obj(host_post_info)
+host_info = upgrade_to_helix(host_info, host_post_info)
 releasever = get_host_releasever(host_info)
 host_post_info.releasever = releasever
 
@@ -131,7 +131,7 @@
         # c74 do not apply the change. Therefore, if ceph bs host is c74 and
         # mn is c76 or c79 and qemu-kvm not installed, using qemu-kvm instead
         # qemu-kvm-ev
-        if releasever == 'c74' and get_mn_release() in ['c76', 'c79']:
+        if releasever == 'c74' and get_mn_release() in ['c76', 'c79', 'h76c', 'h79c']:
             install_rpm_list += " qemu-kvm"
 
     if zstack_repo != 'false':
diff --git a/cephprimarystorage/ansible/cephp.py b/cephprimarystorage/ansible/cephp.py
@@ -60,6 +60,7 @@
 
 # include zstacklib.py
 host_info = get_remote_host_info_obj(host_post_info)
+host_info = upgrade_to_helix(host_info, host_post_info)
 releasever = get_host_releasever(host_info)
 host_post_info.releasever = releasever
 
@@ -113,7 +114,7 @@
         # c74 do not apply the change. Therefore, if ceph bs host is c74 and
         # mn is c76 or c79 and qemu-kvm not installed, using qemu-kvm instead
         # qemu-kvm-ev
-        if releasever == 'c74' and get_mn_release() in ['c76', 'c79']:
+        if releasever == 'c74' and get_mn_release() in ['c76', 'c79', 'h76c', 'h79c']:
             install_rpm_list += " qemu-kvm"
 
     if zstack_repo != 'false':
diff --git a/consoleproxy/ansible/consoleproxy.py b/consoleproxy/ansible/consoleproxy.py
@@ -51,6 +51,7 @@
 
 # include zstacklib.py
 host_info = get_remote_host_info_obj(host_post_info)
+host_info = upgrade_to_helix(host_info, host_post_info)
 releasever = get_host_releasever(host_info)
 host_post_info.releasever = releasever
 
diff --git a/imagestorebackupstorage/ansible/imagestorebackupstorage.py b/imagestorebackupstorage/ansible/imagestorebackupstorage.py
@@ -64,6 +64,7 @@
 
 # include zstacklib.py
 host_info = get_remote_host_info_obj(host_post_info)
+host_info = upgrade_to_helix(host_info, host_post_info)
 releasever = get_host_releasever(host_info)
 host_post_info.releasever = releasever
 
@@ -107,7 +108,7 @@
 
     if not remote_bin_installed(host_post_info, "qemu-img", return_status=True):
         pkg = 'qemu-img-ev' if releasever in ['c74'] else 'qemu-img'
-        if releasever == 'c74' and get_mn_release() in ['c76', 'c79']:
+        if releasever == 'c74' and get_mn_release() in ['c76', 'c79', 'h76c', 'h79c']:
             pkg = 'qemu-img'
         qemu_pkg += ' %s' % pkg
 
diff --git a/installation/install.sh b/installation/install.sh
@@ -33,7 +33,7 @@ export TERM=xterm
 
 OS=''
 IS_UBUNTU='n'
-REDHAT_OS="CENTOS6 CENTOS7 RHEL7 ALIOS7 ISOFT4 KYLIN10 EULER20 UOS1020A NFS4 ROCKY8"
+REDHAT_OS="CENTOS6 CENTOS7 RHEL7 HELIX7 ALIOS7 ISOFT4 KYLIN10 EULER20 UOS1020A NFS4 ROCKY8"
 DEBIAN_OS="UBUNTU14.04 UBUNTU16.04 UBUNTU KYLIN4.0.2 DEBIAN9 UOS20"
 KYLIN_V10_OS="ky10sp1 ky10sp2 ky10sp3"
 XINCHUANG_OS="$KYLIN10_OS uos20"
@@ -663,7 +663,7 @@ cs_check_hostname_zstack(){
         hostname $CHANGE_HOSTNAME
         echo $MANAGEMENT_IP $CHANGE_HOSTNAME >> /etc/hosts
 
-or following commands in CentOS7:
+or following commands in CentOS7 or Helix7:
         hostnamectl set-hostname $CHANGE_HOSTNAME
         hostname $CHANGE_HOSTNAME
         echo $MANAGEMENT_IP $CHANGE_HOSTNAME >> /etc/hosts
@@ -690,7 +690,7 @@ or following commands in CentOS7:
 
     # current hostname is same with IP
     echo "Your OS hostname is set as $current_hostname, which is same with your IP address. It will cause some problem.
-Please fix it by running following commands in CentOS7:
+Please fix it by running following commands in CentOS7 or Helix7:
 
     hostnamectl set-hostname MY_REAL_HOSTNAME
     hostname MY_REAL_HOSTNAME
@@ -808,7 +808,7 @@ check_system(){
     echo_title "Check System"
     echo ""
     trap 'traplogger $LINENO "$BASH_COMMAND" $?'  DEBUG
-    cat /etc/*-release |egrep -i -h "centos |Red Hat Enterprise|Alibaba|NeoKylin|Kylin Linux Advanced Server release V10|openEuler|UnionTech OS Server release 20 \(kongzi\)|NFSChina Server release 4.0.220727 \(RTM3\)|Rocky Linux" >>$ZSTACK_INSTALL_LOG 2>&1
+    cat /etc/*-release |egrep -i -h "centos |Helix|Red Hat Enterprise|Alibaba|NeoKylin|Kylin Linux Advanced Server release V10|openEuler|UnionTech OS Server release 20 \(kongzi\)|NFSChina Server release 4.0.220727 \(RTM3\)|Rocky Linux" >>$ZSTACK_INSTALL_LOG 2>&1
     if [ $? -eq 0 ]; then
         grep -qi 'CentOS release 6' /etc/system-release && OS="CENTOS6"
         grep -qi 'CentOS Linux release 7' /etc/system-release && OS="CENTOS7"
@@ -821,6 +821,7 @@ check_system(){
         grep -qi 'UnionTech OS Server release 20 (kongzi)' /etc/system-release && OS="UOS1020A"
         grep -qi 'NFSChina Server release 4.0.220727 (RTM3)' /etc/system-release && OS="NFS4"
         grep -qi 'Rocky Linux release 8.4 (Green Obsidian)' /etc/system-release && OS="ROCKY8"
+        grep -qi 'Helix release 7' /etc/system-release && OS="HELIX7"
         if [[ -z "$OS" ]];then
             fail2 "Host OS checking failure: your system is: `cat /etc/redhat-release`, $PRODUCT_NAME management node only supports $SUPPORTED_OS currently"
         elif [[ $OS == "CENTOS7" ]];then
@@ -905,7 +906,7 @@ cs_check_epel(){
     trap 'traplogger $LINENO "$BASH_COMMAND" $?'  DEBUG
     [ -z $YUM_ONLINE_REPO ] && return
     [ ! -z $ZSTACK_PKG_MIRROR ] && return
-    if [ "$OS" = "CENTOS7" -o "$OS" = "CENTOS6" ]; then 
+    if [ x"$OS" = x"CENTOS7" -o x"$OS" = x"CENTOS6" -o x"$OS" = x"HELIX7" ]; then 
         if [ ! -f /etc/yum.repos.d/epel.repo ]; then
             if [ x"$UPGRADE" != x'n' ]; then
                 [ ! -z $ZSTACK_YUM_REPOS ] && return
@@ -2389,7 +2390,10 @@ install_sds(){
 
 install_zops(){
     [[ x"$BASEARCH" != x"x86_64" ]] && return
-    [[ x"$OS" != x"CENTOS7" ]] && return
+    [[ x"$OS" != x"CENTOS7" && x"$OS" != x"HELIX7" ]] && return
+    mkdir -p /usr/local/zops
+    chmod o+r /usr/local/zops
+    echo "true" > /usr/local/zops/cloud_integration
     [[ x"$SKIP_ZOPS_INSTALL" = x"y" ]] && return
     echo_title "Install or upgrade ZOps"
     echo ""
diff --git a/iscsifilesystemagent/ansible/iscsi.py b/iscsifilesystemagent/ansible/iscsi.py
@@ -54,6 +54,7 @@
 
 # include zstacklib.py
 host_info = get_remote_host_info_obj(host_post_info)
+host_info = upgrade_to_helix(host_info, host_post_info)
 releasever = get_host_releasever(host_info)
 host_post_info.releasever = releasever
 
diff --git a/kvmagent/ansible/kvm.py b/kvmagent/ansible/kvm.py
@@ -80,6 +80,7 @@
     host_post_info.become = True
 
 host_info = get_remote_host_info_obj(host_post_info)
+host_info = upgrade_to_helix(host_info, host_post_info)
 releasever = get_host_releasever(host_info)
 host_post_info.releasever = releasever
 
@@ -208,6 +209,8 @@ def rpm_based_install():
             'c74': 'qemu-kvm-ev ',
             'c76': 'qemu-kvm libvirt-admin seabios-bin nping elfutils-libelf-devel',
             'c79': 'qemu-kvm libvirt-admin seabios-bin nping elfutils-libelf-devel',
+            'h76c': 'qemu-kvm libvirt-admin seabios-bin nping elfutils-libelf-devel',
+            'h79c': 'qemu-kvm libvirt-admin seabios-bin nping elfutils-libelf-devel',
             'rl84': 'qemu-kvm libvirt-daemon libvirt-daemon-kvm seabios-bin elfutils-libelf-devel',
             'euler20': 'vconfig open-iscsi OpenIPMI-modalias qemu python2-pyudev collectd-disk',
             'nfs4': 'vconfig iscsi-initiator-utils OpenIPMI nettle libselinux-devel iptables iptables-services qemu-kvm python2-pyudev collectd-disk'
@@ -428,7 +431,7 @@ def rpm_based_deprecated():
 
         rpm_deprecated_list = rpm_deprecated.get(host_info.host_arch + releasever, "")
         # new-add host
-        if releasever in ['c76', 'c79'] and "qemu-kvm" not in skip_packages:
+        if releasever in ['c76', 'c79', 'h76c', 'h79c'] and "qemu-kvm" not in skip_packages:
             rpm_deprecated_list += " qemu-img-ev qemu-kvm-ev qemu-kvm-common-ev"
 
         for rpm in rpm_deprecated_list.split():
diff --git a/kvmagent/kvmagent/plugins/host_plugin.py b/kvmagent/kvmagent/plugins/host_plugin.py
@@ -999,6 +999,8 @@ def _cache_units_convert(self, str):
     def fact(self, req):
         rsp = HostFactResponse()
         rsp.osDistribution, rsp.osVersion, rsp.osRelease = platform.dist()
+        if rsp.osDistribution == 'centos':
+            rsp.osDistribution = platform.linux_distribution()[0].lower()
         rsp.osRelease = rsp.osRelease if rsp.osRelease else "Core"
         # compatible with Kylin SP2 HostOS ISO and standardized ISO
         rsp.osRelease = rsp.osRelease.replace('ZStack', 'Sword') if rsp.osDistribution == "kylin" else rsp.osRelease
@@ -1489,7 +1491,7 @@ def update_os(self, req):
         yum_cmd = "export YUM0={};echo {}>/etc/yum/vars/YUM0;yum --enablerepo=* clean all && yum --disablerepo=* --enablerepo=zstack-mn,qemu-kvm-ev-mn{} {} update {} -y"
         yum_cmd = yum_cmd.format(releasever, releasever, ',zstack-experimental-mn' if cmd.enableExpRepo else '', exclude, updates)
         #support update qemu-kvm and update OS
-        if releasever in ['c74', 'c76', 'c79']:
+        if releasever in ['c74', 'c76', 'c79', 'h76c', 'h79c']:
             if "qemu-kvm" in updates or cmd.releaseVersion is not None:
                 update_qemu_cmd = "export YUM0={};yum --disablerepo=* --enablerepo=zstack-mn,qemu-kvm-ev-mn  swap -y -- remove qemu-img-ev -- install qemu-img " \
                               "&& yum remove qemu-kvm-ev qemu-kvm-common-ev -y && yum --disablerepo=* --enablerepo=zstack-mn,qemu-kvm-ev-mn install qemu-kvm qemu-kvm-common -y && "
diff --git a/sftpbackupstorage/ansible/sftpbackupstorage.py b/sftpbackupstorage/ansible/sftpbackupstorage.py
@@ -57,6 +57,7 @@
 
 # include zstacklib.py
 host_info = get_remote_host_info_obj(host_post_info)
+host_info = upgrade_to_helix(host_info, host_post_info)
 releasever = get_host_releasever(host_info)
 host_post_info.releasever = releasever
 
diff --git a/virtualrouter/ansible/virtualrouter.py b/virtualrouter/ansible/virtualrouter.py
@@ -55,6 +55,7 @@
 
 # include zstacklib.py
 host_info = get_remote_host_info_obj(host_post_info)
+host_info = upgrade_to_helix(host_info, host_post_info)
 releasever = get_host_releasever(host_info)
 host_post_info.releasever = releasever
 
diff --git a/zstackbuild/pypi_source/pypi/ansible-1.9.6.tar.gz b/zstackbuild/pypi_source/pypi/ansible-1.9.6.tar.gz
diff --git a/zstackbuild/pypi_source/pypi/ansible_core-2.11.12.3-py2.py3-none-any.whl b/zstackbuild/pypi_source/pypi/ansible_core-2.11.12.3-py2.py3-none-any.whl
diff --git a/zstackbuild/pypi_source/pypi/simple/ansible-core/ansible_core-2.11.12.3-py2.py3-none-any.whl b/zstackbuild/pypi_source/pypi/simple/ansible-core/ansible_core-2.11.12.3-py2.py3-none-any.whl
@@ -0,0 +1 @@
+../../ansible_core-2.11.12.3-py2.py3-none-any.whl
diff --git a/zstackbuild/pypi_source/pypi/simple/ansible-core/index.html b/zstackbuild/pypi_source/pypi/simple/ansible-core/index.html
@@ -1 +1 @@
-<a href='ansible_core-2.11.12.2-py2.py3-none-any.whl'>ansible_core-2.11.12.1-py2.py3-none-any.whl</a><br />
+<a href='ansible_core-2.11.12.3-py2.py3-none-any.whl'>ansible_core-2.11.12.3-py2.py3-none-any.whl</a><br />
diff --git a/zstackctl/zstackctl/zstacklib.py b/zstackctl/zstackctl/zstacklib.py
@@ -238,6 +238,8 @@ def get_host_releasever(ansible_distribution):
         "centos core 7.4.1708": "c74",
         "centos core 7.2.1511": "c74",  # c74 for old releases
         "centos core 7.1.1503": "c74",
+        'helix core 7.6c': 'h76c',
+        'helix core 7.9c': 'h79c',
         "uniontech kongzi 20": "uos1021a",
         "rocky green obsidian 8.4": "rl84",
     }
diff --git a/zstacklib/ansible/zstacklib.py b/zstacklib/ansible/zstacklib.py
@@ -40,13 +40,13 @@
 trusted_host = ""
 uos = ['uos20', 'uos1021a']
 kylin = ["ky10sp1", "ky10sp2", "ky10sp3"]
-centos = ['c74', 'c76', 'c79', 'rl84']
+centos = ['c74', 'c76', 'c79', 'h76c', 'h79c', 'rl84']
 enable_networkmanager_list = kylin + ["euler20", "uos1021a", "nfs4", "rl84"]
 supported_arch_list = ["x86_64", "aarch64", "mips64el", "loongarch64"]
 
 RPM_BASED_OS = ["kylin_zstack", "kylin_tercel", "kylin_sword", "kylin_lance",
                 "alibaba", "centos", "openeuler", "uniontech_kongzi", "nfs",
-                "redhat", "rocky"]
+                "redhat", "rocky", "helix"]
 DEB_BASED_OS = ["ubuntu", "uos", "kylin4.0.2", "debian", "uniontech_fou"]
 DISTRO_WITH_RPM_DEB = ["kylin", "uniontech"]
 
@@ -60,7 +60,9 @@
     "c79": "qemu-kvm",
     "euler20": "qemu",
     "uos1021a": "qemu-kvm",
-    "nfs4": "qemu-kvm"
+    "nfs4": "qemu-kvm",
+    'h76c': 'qemu-kvm',
+    'h79c': 'qemu-kvm'
 }
 
 ansible_constants.set_constant('HOST_KEY_CHECKING', False)
@@ -524,6 +526,8 @@ def get_host_releasever(host_info):
         "centos core 7.4.1708": "c74",
         "centos core 7.2.1511": "c74",  # c74 for old releases
         "centos core 7.1.1503": "c74",
+        'helix core 7.6c': 'h76c',
+        'helix core 7.9c': 'h79c',
         "openeuler lts-sp1 20.03": "euler20",
         "uos fou 20": "uos20",
         "uniontech_kongzi kongzi 20": "uos1021a",
@@ -2125,10 +2129,46 @@ def check_umask(host_post_info):
     run_remote_command(check_umask_cmd, host_post_info)
 
 
+def upgrade_to_helix(host_info, host_post_info):
+    releasever = get_host_releasever(host_info)
+    if releasever in ['c76', 'c79']:
+        distro_name = {
+            'c76': 'h76c',
+            'c79': 'h79c'
+            }.get(releasever)
+        if not os.path.exists('/opt/zstack-dvd/x86_64/%s' % distro_name):
+            return host_info
+        pkg_name = {
+            'c76': 'helix-release-7-6c.0.h7.helix.x86_64.rpm',
+            'c79': 'helix-release-7-9c.0.h7.helix.x86_64.rpm'
+        }.get(releasever)
+        helix_release_pkg = '/opt/zstack-dvd/x86_64/%s/Packages/%s' % (
+            distro_name, pkg_name)
+        install_cmd = ('yum install -y /opt/%s && sed -i "/distroverpkg=/d; '
+                       '/bugtracker_url=/d" /etc/yum.conf') % pkg_name
+
+        copy_arg = CopyArg()
+        copy_arg.src = helix_release_pkg
+        copy_arg.dest = '/opt'
+        copy(copy_arg, host_post_info)
+        run_remote_command(install_cmd, host_post_info)
+
+        # flush ansible cache after upgrading
+        global _ansible_cache
+        _ansible_cache = {}
+        host_info = get_remote_host_info_obj(host_post_info)
+
+    return host_info
+
+
 def install_release_on_host(is_rpm, host_info, host_post_info):
     releasever = get_host_releasever(host_info)
     if is_rpm:
-        release_name = 'el8' if releasever in ['rl84'] else 'el7'
+        release_name_mapping = {
+            'rl84': 'el8',
+            'h76c': 'h7',
+            'h79c': 'h7'}
+        release_name = release_name_mapping.get(releasever, 'el7')
         pkg_name = 'zstack-release-{0}-1.{1}.zstack.noarch.rpm'.format(releasever, release_name)
         src_pkg = '/opt/zstack-dvd/{0}/{1}/Packages/{2}'.format(host_info.host_arch, releasever, pkg_name)
         install_cmd = ("[[ x`rpm -qi zstack-release |awk -F ':' '/Version/{print $2}' |sed 's/ //g'` == x%s ]] || "
diff --git a/zstacknetwork/ansible/zsnagentansible.py b/zstacknetwork/ansible/zsnagentansible.py
@@ -69,6 +69,7 @@ def add_true_in_command(cmd):
 
 # include zstacklib.py
 host_info = get_remote_host_info_obj(host_post_info)
+host_info = upgrade_to_helix(host_info, host_post_info)
 releasever = get_host_releasever(host_info)
 host_post_info.releasever = releasever
 
diff --git a/zstacksharedblock/ansible/zsblkagentansible.py b/zstacksharedblock/ansible/zsblkagentansible.py
@@ -71,6 +71,7 @@ def add_true_in_command(cmd):
 
 # include zstacklib.py
 host_info = get_remote_host_info_obj(host_post_info)
+host_info = upgrade_to_helix(host_info, host_post_info)
 releasever = get_host_releasever(host_info)
 host_post_info.releasever = releasever
 
