From 2ae9da76235599aa3b3870b303f95571396d0045 Mon Sep 17 00:00:00 2001
From: Luke Browning <lukebrowning@us.ibm.com>
Date: Thu, 25 Jan 2018 18:08:48 -0600
Subject: [PATCH] Fix Cassandra element

The pip command was not installed.  Added a couple of
prerequisites (snappy, Cython) and db management package.
The cassandra-tools package provides commands for enabling
and disabling incremental backup, snapshots, and many other
features.  It is provided by the cassandra community.

Change-Id: If0f807878d6f3da17e33bc9e40ecb9563de61a25
---
 .../elements/ubuntu-cassandra/install.d/10-cassandra   | 10 +++++++---
 integration/scripts/trovestack                         |  2 +-
 2 files changed, 8 insertions(+), 4 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 2430715608..205fffefbe 100755
--- a/integration/scripts/files/elements/ubuntu-cassandra/install.d/10-cassandra
+++ b/integration/scripts/files/elements/ubuntu-cassandra/install.d/10-cassandra
@@ -15,16 +15,20 @@ export DEBIAN_FRONTEND=noninteractive
 apt-get --allow-unauthenticated install -qy curl
 echo "deb http://www.apache.org/dist/cassandra/debian ${CASSANDRA_RELEASE} main" >> /etc/apt/sources.list.d/cassandra.sources.list
 curl https://www.apache.org/dist/cassandra/KEYS | sudo apt-key add -
-apt-get update
+apt-get -y update
 apt-get --allow-unauthenticated install -qy openjdk-${CASSANDRA_JAVA}-jdk expect python-dev
-apt-get --allow-unauthenticated install -qy libxml2-dev ntp mc
+apt-get --allow-unauthenticated install -qy libxml2-dev ntp mc libev4 libev-dev
 apt-get --allow-unauthenticated install -qy libxslt1-dev python-pexpect
 apt-get --allow-unauthenticated install -qy python-migrate build-essential
+apt-get --allow-unauthenticated install -qy python-setuptools python-pip python-snappy
 
-apt-get --allow-unauthenticated install -qy cassandra
+apt-get --allow-unauthenticated install -qy cassandra cassandra-tools
+
+pip2 install Cython
 
 # The Python Driver 2.0 for Apache Cassandra.
 pip2 install cassandra-driver
+
 # Sorted sets support for the Python driver.
 pip2 install blist
 
diff --git a/integration/scripts/trovestack b/integration/scripts/trovestack
index 244737c519..0ede5ed6ad 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="2.1.0"
+        VERSION="3.11.1"
     elif [ "$DATASTORE_TYPE" == "couchbase" ]; then
         PACKAGES=${PACKAGES:-"couchbase-server"}
         VERSION="2.2.0"