Merge pull request #46176 from athanatos/sjust/wip-55563

vstart: default CEPH_ASOK_DIR to asok/

Reviewed-by: Milind Changire <mchangir@redhat.com>
This commit is contained in:
Samuel Just 2022-05-17 07:53:15 -07:00 committed by GitHub
commit 3cc7b3b7bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -42,7 +42,7 @@ if [ -n "$VSTART_DEST" ]; then
CEPH_CONF_PATH=$VSTART_DEST
CEPH_DEV_DIR=$VSTART_DEST/dev
CEPH_OUT_DIR=$VSTART_DEST/out
CEPH_ASOK_DIR=$VSTART_DEST/out
CEPH_ASOK_DIR=$VSTART_DEST/asok
fi
get_cmake_variable() {
@ -128,7 +128,7 @@ fi
[ -z "$CEPH_DIR" ] && CEPH_DIR="$PWD"
[ -z "$CEPH_DEV_DIR" ] && CEPH_DEV_DIR="$CEPH_DIR/dev"
[ -z "$CEPH_OUT_DIR" ] && CEPH_OUT_DIR="$CEPH_DIR/out"
[ -z "$CEPH_ASOK_DIR" ] && CEPH_ASOK_DIR="$CEPH_DIR/out"
[ -z "$CEPH_ASOK_DIR" ] && CEPH_ASOK_DIR="$CEPH_DIR/asok"
[ -z "$CEPH_RGW_PORT" ] && CEPH_RGW_PORT=8000
[ -z "$CEPH_CONF_PATH" ] && CEPH_CONF_PATH=$CEPH_DIR