update source to Ceph Pacific 16.2.2

[ceph.git] / ceph / src / spdk / scripts / vagrant / create_vhost_vm.sh

diff --git a/ceph/src/spdk/scripts/vagrant/create_vhost_vm.sh b/ceph/src/spdk/scripts/vagrant/create_vhost_vm.sh
index e87faa6cd914a30184bc3c50ad91971e37820efc..5ad416c3bcc5d9f474dffa32e494ff65825a0e32 100755 (executable)
--- a/ceph/src/spdk/scripts/vagrant/create_vhost_vm.sh
+++ b/ceph/src/spdk/scripts/vagrant/create_vhost_vm.sh
@@ -8,8 +8,8 @@ set -e
 
 VAGRANT_TARGET="$PWD"
 
-DIR="$( cd "$( dirname $0 )" && pwd )"
-SPDK_DIR="$( cd "${DIR}/../../" && pwd )"
+DIR="$(cd "$(dirname $0)" && pwd)"
+SPDK_DIR="$(cd "${DIR}/../../" && pwd)"
 USE_SSH_DIR=""
 MOVE_TO_DEFAULT_DIR=false
 INSTALL_DEPS=false
@@ -19,7 +19,7 @@ display_help() {
        echo
        echo " Usage: ${0##*/} <distro>"
        echo
-       echo "  distro = <ubuntu16 | ubuntu18> "
+       echo "  distro = <ubuntu16 | ubuntu18 | fedora31> "
        echo
        echo "  --use-ssh-dir=<dir path>    Use existing spdk_vhost_id_rsa keys from specified directory"
        echo "                              for setting up SSH key pair on VM"
@@ -37,53 +37,56 @@ display_help() {
 while getopts ":h-:" opt; do
        case "${opt}" in
                -)
-               case "${OPTARG}" in
-                       use-ssh-dir=*) USE_SSH_DIR="${OPTARG#*=}" ;;
-                       move-to-default-dir) MOVE_TO_DEFAULT_DIR=true ;;
-                       install-deps) INSTALL_DEPS=true ;;
-                       http-proxy=*)
-                               http_proxy=$OPTARG
-                               https_proxy=$http_proxy
-                               SPDK_VAGRANT_HTTP_PROXY="${http_proxy}"
+                       case "${OPTARG}" in
+                               use-ssh-dir=*) USE_SSH_DIR="${OPTARG#*=}" ;;
+                               move-to-default-dir) MOVE_TO_DEFAULT_DIR=true ;;
+                               install-deps) INSTALL_DEPS=true ;;
+                               http-proxy=*)
+                                       http_proxy=$OPTARG
+                                       https_proxy=$http_proxy
+                                       SPDK_VAGRANT_HTTP_PROXY="${http_proxy}"
+                                       ;;
+                               *)
+                                       echo "  Invalid argument -$OPTARG" >&2
+                                       echo "  Try \"$0 -h\"" >&2
+                                       exit 1
+                                       ;;
+                       esac
                        ;;
-                       *)
-                               echo "  Invalid argument -$OPTARG" >&2
-                               echo "  Try \"$0 -h\"" >&2
-                               exit 1
-                               ;;
-               esac
-               ;;
                h)
                        display_help >&2
                        exit 0
-               ;;
+                       ;;
                *)
                        echo "  Invalid argument: -$OPTARG" >&2
                        echo "  Try: \"$0 -h\"" >&2
                        exit 1
-               ;;
+                       ;;
        esac
 done
 export SPDK_DIR
 export SPDK_VAGRANT_HTTP_PROXY
 export INSTALL_DEPS
 
+shift "$((OPTIND - 1))" # Discard the options and sentinel --
 
-shift "$((OPTIND-1))"   # Discard the options and sentinel --
-SPDK_VAGRANT_DISTRO="$@"
+SPDK_VAGRANT_DISTRO="$*"
 
-case "$SPDK_VAGRANT_DISTRO" in
+case "${SPDK_VAGRANT_DISTRO}" in
        ubuntu16)
                export SPDK_VAGRANT_DISTRO
-       ;;
+               ;;
        ubuntu18)
                export SPDK_VAGRANT_DISTRO
-       ;;
+               ;;
+       fedora31)
+               export SPDK_VAGRANT_DISTRO
+               ;;
        *)
                echo "  Invalid argument \"${SPDK_VAGRANT_DISTRO}\""
                echo "  Try: \"$0 -h\"" >&2
                exit 1
-       ;;
+               ;;
 esac
 
 mkdir -vp "${VAGRANT_TARGET}/${SPDK_VAGRANT_DISTRO}"
@@ -100,7 +103,7 @@ fi
 export SPDK_VAGRANT_SSH_KEY="${VAGRANT_TARGET}/${SPDK_VAGRANT_DISTRO}/ssh_keys/spdk_vhost_id_rsa"
 
 pushd "${VAGRANT_TARGET}/${SPDK_VAGRANT_DISTRO}"
-if [ ! -z "${http_proxy}" ]; then
+if [ -n "${http_proxy}" ]; then
        export http_proxy
        export https_proxy
        if vagrant plugin list | grep -q vagrant-proxyconf; then