From c1b82ffa9c92a49fda1d0e15f6b8832b66c63b28 Mon Sep 17 00:00:00 2001 From: Pierre Blanc Date: Tue, 23 Jan 2018 18:28:24 -0500 Subject: [PATCH] Revert Cassandra version to 2 on ubuntu element The element is configured to use version 3 of cassandra, unfortunatly trove is actually not compatible with version 3. Closes-Bug: #1745056 Change-Id: Ic22202eeae6f404433a84def8cf5da0e5dc28c7b --- .../files/elements/ubuntu-cassandra/install.d/10-cassandra | 2 +- integration/scripts/trovestack | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/integration/scripts/files/elements/ubuntu-cassandra/install.d/10-cassandra b/integration/scripts/files/elements/ubuntu-cassandra/install.d/10-cassandra index 205fffefbe..77233f4cd3 100755 --- a/integration/scripts/files/elements/ubuntu-cassandra/install.d/10-cassandra +++ b/integration/scripts/files/elements/ubuntu-cassandra/install.d/10-cassandra @@ -9,7 +9,7 @@ if [ -z "$CASSANDRA_JAVA" ]; then CASSANDRA_JAVA=8; fi # Set CASSANDRA_RELEASE to override which casandra release to use, defaults to 311x # For current releases supported, see http://cassandra.apache.org/download/ or # http://dl.bintray.com/apache/cassandra/dists/ -if [ -z "$CASSANDRA_RELEASE" ]; then CASSANDRA_RELEASE=311x; fi +if [ -z "$CASSANDRA_RELEASE" ]; then CASSANDRA_RELEASE=21x; fi export DEBIAN_FRONTEND=noninteractive apt-get --allow-unauthenticated install -qy curl diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack index 0ede5ed6ad..244737c519 100755 --- a/integration/scripts/trovestack +++ b/integration/scripts/trovestack @@ -578,7 +578,7 @@ function cmd_set_datastore() { VERSION="3.2.6" elif [ "$DATASTORE_TYPE" == "cassandra" ]; then PACKAGES=${PACKAGES:-"cassandra"} - VERSION="3.11.1" + VERSION="2.1.0" elif [ "$DATASTORE_TYPE" == "couchbase" ]; then PACKAGES=${PACKAGES:-"couchbase-server"} VERSION="2.2.0"