From: Changcheng Liu <changcheng.liu@aliyun.com>
Date: Tue, 2 Jun 2020 06:05:05 +0000 (+0800)
Subject: bootstrap: support python3-virtualenv
X-Git-Tag: v2.1.0~14^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fc7c2acf6b323a22aa2a30e085e56639348b903d;p=ceph-deploy.git

bootstrap: support python3-virtualenv

Signed-off-by: Changcheng Liu <changcheng.liu@aliyun.com>
---

diff --git a/bootstrap b/bootstrap
index 2580fbc..c29bdc4 100755
--- a/bootstrap
+++ b/bootstrap
@@ -8,13 +8,15 @@ if ! [ -d virtualenv ]; then
     if command -v lsb_release >/dev/null 2>&1; then
         if [ "$1" = "2" ]; then
             python_package="python"
+            python_virtualenv_package="python-virtualenv"
         else
             python_package="python$1"
+            python_virtualenv_package="python$1-virtualenv"
         fi
 
         case "$(lsb_release --id --short)" in
         Ubuntu|Debian)
-            for package in "$python_package" python-virtualenv; do
+            for package in "$python_package" "$python_virtualenv_package"; do
             if [ "$(dpkg --status -- "$package" 2>/dev/null|sed -n 's/^Status: //p')" != "install ok installed" ]; then
                 # add a space after old values
                 missing="${missing:+$missing }$package"