From 0594c412c406b22725b33633299d85587ee03f08 Mon Sep 17 00:00:00 2001 From: shrek2000 Date: Thu, 30 Jan 2020 14:52:49 +0200 Subject: Upgrade to Cassandra 3 Creating base dockers suitable for Cassandra 3 remove cqlsh version Change-Id: I996bad2341410cdf45c49f191e998acf4781fc5d Issue-ID: SDC-2596 Signed-off-by: shrek2000 --- .../cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes') diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb index a0a6bc06d4..3ec26cf2dd 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb @@ -24,12 +24,13 @@ template "janusgraph.properties" do mode "0755" variables({ :cassandra_ip => node['Nodes']['CS'].join(",").gsub(/[|]/,''), + :cassandra_cql_port => node['cassandra'][:cassandra_port], :cassandra_pwd => node['cassandra'][:cassandra_password], :cassandra_usr => node['cassandra'][:cassandra_user], :rep_factor => replication_factor, :DC_NAME => node['cassandra']['datacenter_name'], :DC_NAME_WITH_REP => janusgraph_dcname_with_rep, - :janusgraph_connection_timeout => node['cassandra']['janusgraph_connection_timeout'], + :janus_connection_timeout => node['cassandra']['janusgraph_connection_timeout'], :cassandra_truststore_password => node['cassandra'][:truststore_password], :cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}" }) -- cgit 1.2.3-korg