From cbaea172cd78792cfdb3c196f6a248f21615865e Mon Sep 17 00:00:00 2001 From: Glauber Costa Date: Mon, 3 Jun 2019 12:24:47 -0400 Subject: [PATCH] python3: add the cassandra driver to the relocatable package We have a script in tree that fixes the schema for distributed system tables, like tracing, should they change their schema. We use it all the time but unfortunately it is not distributed with the scylla package, which makes it using it harder (we want to do this in the server, but consistent updates will take a while). One of the problems with the script today that makes distributing it harder is that it uses the python3 cassandra driver, that we don't want to have as a server dependency. But now with the relocatable packages in place there is no reaso not to just add it. [avi: adjust tools/toolchain/image to point to a new image with python3-cassandra-driver] Signed-off-by: Glauber Costa Message-Id: <20190603162447.24215-1-glauber@scylladb.com> --- install-dependencies.sh | 1 + reloc/python3/build_reloc.sh | 2 +- tools/toolchain/image | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/install-dependencies.sh b/install-dependencies.sh index 699581bae2..408232eb92 100755 --- a/install-dependencies.sh +++ b/install-dependencies.sh @@ -60,6 +60,7 @@ fedora_packages=( python3-setuptools python3-magic python3-psutil + python3-cassandra-driver dnf-utils pigz net-tools diff --git a/reloc/python3/build_reloc.sh b/reloc/python3/build_reloc.sh index c7c32ab4e6..245d0d0332 100755 --- a/reloc/python3/build_reloc.sh +++ b/reloc/python3/build_reloc.sh @@ -32,5 +32,5 @@ PYVER=$(python3 -V | cut -d' ' -f2) echo "$PYVER" > build/python3/SCYLLA-VERSION-FILE ln -fv build/SCYLLA-RELEASE-FILE build/python3/SCYLLA-RELEASE-FILE -PACKAGES="python3-pyyaml python3-urwid python3-pyparsing python3-requests python3-pyudev python3-setuptools python3-psutil" +PACKAGES="python3-pyyaml python3-urwid python3-pyparsing python3-requests python3-pyudev python3-setuptools python3-psutil python3-cassandra-driver" ./scripts/create-relocatable-package-python3.py --output "$TARGET" $PACKAGES diff --git a/tools/toolchain/image b/tools/toolchain/image index 0760026020..6899e0e8ad 100644 --- a/tools/toolchain/image +++ b/tools/toolchain/image @@ -1 +1 @@ -docker.io/scylladb/scylla-toolchain:fedora-29-20190405 +docker.io/scylladb/scylla-toolchain:fedora-29-20190603