Merge branch 'enable_x86_ns10' into 'master'

<fix>[sftpbackupstorage]: install nmap when deploy ns10

See merge request zstackio/zstack-utility!2269

Author: gitlab

sftpbackupstorage/ansible/sftpbackupstorage.py

@@ -86,10 +86,14 @@
     run_remote_command(command, host_post_info)
 
 if distro in RPM_BASED_OS:
+    install_pkgs = 'openssh-clients qemu-img'
+    if releasever in ['ns10']:
+        install_pkgs = "nmap {}".format(install_pkgs)
+
     if zstack_repo != 'false':
         # name: install sftp backup storage related packages on RedHat based OS from local
-        command = ("pkg_list=`rpm -q openssh-clients qemu-img | grep \"not installed\" | awk '{ print $2 }'` && for pkg"
-                   " in $pkg_list; do yum --disablerepo=* --enablerepo=%s install -y $pkg; done;") % (zstack_repo)
+        command = ("pkg_list=`rpm -q %s | grep \"not installed\" | awk '{ print $2 }'` && for pkg"
+                   " in $pkg_list; do yum --disablerepo=* --enablerepo=%s install -y $pkg; done;") % (install_pkgs, zstack_repo)
         run_remote_command(command, host_post_info)
     else:
         # name: install sftp backup storage related packages on RedHat based OS from online