mirror of
https://gitlab.com/libvirt/libvirt.git
synced 2024-07-30 21:47:18 +00:00
update sheepdog client] update sheepdog client path
Nnever sheepdog versions have dog client binary while old have collie. Check them both. Signed-off-by: Vasiliy Tolstov <v.tolstov@selfip.ru>
This commit is contained in:
parent
d823fa6f64
commit
ee4d2908dd
10
configure.ac
10
configure.ac
@ -1959,14 +1959,14 @@ AC_SUBST([LIBRBD_LIBS])
|
|||||||
|
|
||||||
if test "$with_storage_sheepdog" = "yes" ||
|
if test "$with_storage_sheepdog" = "yes" ||
|
||||||
test "$with_storage_sheepdog" = "check"; then
|
test "$with_storage_sheepdog" = "check"; then
|
||||||
AC_PATH_PROG([COLLIE], [collie], [], [$PATH:/sbin:/usr/sbin])
|
AC_PATH_PROGS([SHEEPDOGCLI], [collie dog], [], [$PATH:/sbin:/usr/sbin])
|
||||||
|
|
||||||
if test "$with_storage_sheepdog" = "yes"; then
|
if test "$with_storage_sheepdog" = "yes"; then
|
||||||
if test -z "$COLLIE"; then
|
if test -z "$SHEEPDOGCLI"; then
|
||||||
AC_MSG_ERROR([We need collie for Sheepdog storage driver])
|
AC_MSG_ERROR([We need sheepdog client for Sheepdog storage driver])
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
if test -z "$COLLIE"; then
|
if test -z "$SHEEPDOGCLI"; then
|
||||||
with_storage_sheepdog=no
|
with_storage_sheepdog=no
|
||||||
fi
|
fi
|
||||||
|
|
||||||
@ -1978,7 +1978,7 @@ if test "$with_storage_sheepdog" = "yes" ||
|
|||||||
if test "$with_storage_sheepdog" = "yes"; then
|
if test "$with_storage_sheepdog" = "yes"; then
|
||||||
AC_DEFINE_UNQUOTED([WITH_STORAGE_SHEEPDOG], 1,
|
AC_DEFINE_UNQUOTED([WITH_STORAGE_SHEEPDOG], 1,
|
||||||
[whether Sheepdog backend for storage driver is enabled])
|
[whether Sheepdog backend for storage driver is enabled])
|
||||||
AC_DEFINE_UNQUOTED([COLLIE],["$COLLIE"],[Location of collie program])
|
AC_DEFINE_UNQUOTED([SHEEPDOGCLI],["$SHEEPDOGCLI"],[Location of sheepdog client program])
|
||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
AM_CONDITIONAL([WITH_STORAGE_SHEEPDOG],
|
AM_CONDITIONAL([WITH_STORAGE_SHEEPDOG],
|
||||||
|
@ -150,7 +150,7 @@ virStorageBackendSheepdogRefreshAllVol(virConnectPtr conn ATTRIBUTE_UNUSED,
|
|||||||
char **cells = NULL;
|
char **cells = NULL;
|
||||||
size_t i;
|
size_t i;
|
||||||
|
|
||||||
virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "list", "-r", NULL);
|
virCommandPtr cmd = virCommandNewArgList(SHEEPDOGCLI, "vdi", "list", "-r", NULL);
|
||||||
virStorageBackendSheepdogAddHostArg(cmd, pool);
|
virStorageBackendSheepdogAddHostArg(cmd, pool);
|
||||||
virCommandSetOutputBuffer(cmd, &output);
|
virCommandSetOutputBuffer(cmd, &output);
|
||||||
if (virCommandRun(cmd, NULL) < 0)
|
if (virCommandRun(cmd, NULL) < 0)
|
||||||
@ -195,7 +195,7 @@ virStorageBackendSheepdogRefreshPool(virConnectPtr conn ATTRIBUTE_UNUSED,
|
|||||||
char *output = NULL;
|
char *output = NULL;
|
||||||
virCommandPtr cmd;
|
virCommandPtr cmd;
|
||||||
|
|
||||||
cmd = virCommandNewArgList(COLLIE, "node", "info", "-r", NULL);
|
cmd = virCommandNewArgList(SHEEPDOGCLI, "node", "info", "-r", NULL);
|
||||||
virStorageBackendSheepdogAddHostArg(cmd, pool);
|
virStorageBackendSheepdogAddHostArg(cmd, pool);
|
||||||
virCommandSetOutputBuffer(cmd, &output);
|
virCommandSetOutputBuffer(cmd, &output);
|
||||||
if (virCommandRun(cmd, NULL) < 0)
|
if (virCommandRun(cmd, NULL) < 0)
|
||||||
@ -221,7 +221,7 @@ virStorageBackendSheepdogDeleteVol(virConnectPtr conn ATTRIBUTE_UNUSED,
|
|||||||
|
|
||||||
virCheckFlags(0, -1);
|
virCheckFlags(0, -1);
|
||||||
|
|
||||||
virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "delete", vol->name, NULL);
|
virCommandPtr cmd = virCommandNewArgList(SHEEPDOGCLI, "vdi", "delete", vol->name, NULL);
|
||||||
virStorageBackendSheepdogAddHostArg(cmd, pool);
|
virStorageBackendSheepdogAddHostArg(cmd, pool);
|
||||||
int ret = virCommandRun(cmd, NULL);
|
int ret = virCommandRun(cmd, NULL);
|
||||||
|
|
||||||
@ -273,7 +273,7 @@ virStorageBackendSheepdogBuildVol(virConnectPtr conn,
|
|||||||
goto cleanup;
|
goto cleanup;
|
||||||
}
|
}
|
||||||
|
|
||||||
cmd = virCommandNewArgList(COLLIE, "vdi", "create", vol->name, NULL);
|
cmd = virCommandNewArgList(SHEEPDOGCLI, "vdi", "create", vol->name, NULL);
|
||||||
virCommandAddArgFormat(cmd, "%llu", vol->target.capacity);
|
virCommandAddArgFormat(cmd, "%llu", vol->target.capacity);
|
||||||
virStorageBackendSheepdogAddHostArg(cmd, pool);
|
virStorageBackendSheepdogAddHostArg(cmd, pool);
|
||||||
if (virCommandRun(cmd, NULL) < 0)
|
if (virCommandRun(cmd, NULL) < 0)
|
||||||
@ -358,7 +358,7 @@ virStorageBackendSheepdogRefreshVol(virConnectPtr conn ATTRIBUTE_UNUSED,
|
|||||||
int ret;
|
int ret;
|
||||||
char *output = NULL;
|
char *output = NULL;
|
||||||
|
|
||||||
virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "list", vol->name, "-r", NULL);
|
virCommandPtr cmd = virCommandNewArgList(SHEEPDOGCLI, "vdi", "list", vol->name, "-r", NULL);
|
||||||
virStorageBackendSheepdogAddHostArg(cmd, pool);
|
virStorageBackendSheepdogAddHostArg(cmd, pool);
|
||||||
virCommandSetOutputBuffer(cmd, &output);
|
virCommandSetOutputBuffer(cmd, &output);
|
||||||
ret = virCommandRun(cmd, NULL);
|
ret = virCommandRun(cmd, NULL);
|
||||||
@ -394,7 +394,7 @@ virStorageBackendSheepdogResizeVol(virConnectPtr conn ATTRIBUTE_UNUSED,
|
|||||||
|
|
||||||
virCheckFlags(0, -1);
|
virCheckFlags(0, -1);
|
||||||
|
|
||||||
virCommandPtr cmd = virCommandNewArgList(COLLIE, "vdi", "resize", vol->name, NULL);
|
virCommandPtr cmd = virCommandNewArgList(SHEEPDOGCLI, "vdi", "resize", vol->name, NULL);
|
||||||
virCommandAddArgFormat(cmd, "%llu", capacity);
|
virCommandAddArgFormat(cmd, "%llu", capacity);
|
||||||
virStorageBackendSheepdogAddHostArg(cmd, pool);
|
virStorageBackendSheepdogAddHostArg(cmd, pool);
|
||||||
int ret = virCommandRun(cmd, NULL);
|
int ret = virCommandRun(cmd, NULL);
|
||||||
|
Loading…
Reference in New Issue
Block a user