Merge branch 'db-cassandra' of http://github.com/marko-asplund/FrameworkBenchmarks into 918

config/cassandra/cassandra.yaml

@@ -224,7 +224,7 @@ seed_provider:
       parameters:
           # seeds is actually a comma-delimited list of addresses.
           # Ex: "<ip1>,<ip2>,<ip3>"
-          - seeds: "tfbdata"
+          - seeds: "TFB_DATABASE_HOST"
 
 # For workloads with more data than can fit in memory, Cassandra's
 # bottleneck will be reads that need to fetch data from
@@ -294,7 +294,7 @@ ssl_storage_port: 7001
 # address associated with the hostname (it might not be).
 #
 # Setting this to 0.0.0.0 is always wrong.
-listen_address: tfbdata
+listen_address: TFB_DATABASE_HOST
 
 # Address to broadcast to other Cassandra nodes
 # Leaving this blank will set it to the same value as listen_address
@@ -332,7 +332,7 @@ start_rpc: true
 # Note that unlike ListenAddress above, it is allowed to specify 0.0.0.0
 # here if you want to listen on all interfaces, but that will break clients 
 # that rely on node auto-discovery.
-rpc_address: tfbdata
+rpc_address: TFB_DATABASE_HOST
 # port for Thrift to listen for clients on
 rpc_port: 9160
 

toolset/setup/linux/installer.py

@@ -203,13 +203,14 @@ class Installer:
     rm -rf /ssd/cassandra /ssd/log/cassandra
     sudo mkdir -p /ssd/cassandra /ssd/log/cassandra
     sudo chown tfb:tfb /ssd/cassandra /ssd/log/cassandra
+    sed -e "s/TFB_DATABASE_HOST/$TFB_DATABASE_HOST/" -i'' cassandra/cassandra.yaml
     cp cassandra/cassandra.yaml apache-cassandra-$CASS_V/conf
     cp cassandra/log4j-server.properties apache-cassandra-$CASS_V/conf
     pushd apache-cassandra-$CASS_V
     nohup ./bin/cassandra
     sleep 10
-    cat ../cassandra/create-keyspace.cql | ./bin/cqlsh tfbdata
-    python ../cassandra/db-data-gen.py | ./bin/cqlsh tfbdata
+    cat ../cassandra/create-keyspace.cql | ./bin/cqlsh $TFB_DATABASE_HOST
+    python ../cassandra/db-data-gen.py | ./bin/cqlsh $TFB_DATABASE_HOST
     popd
     """