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 <oren.kleks@amdocs.com>
diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb
index a516c71..38de1e8 100644
--- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb
+++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb
@@ -4,7 +4,7 @@
mode 0755
variables({
:cassandra_ip => node['Nodes']['CS'].first,
- :cassandra_port => node['cassandra']['cassandra_port'],
+ :cassandra_port => node['cassandra'][:cassandra_port],
:DC_NAME => node['cassandra']['datacenter_name'],
:cassandra_pwd => node['cassandra'][:cassandra_password],
:cassandra_usr => node['cassandra'][:cassandra_user]
diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb
index 72a1446..a62550e 100644
--- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb
+++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb
@@ -20,9 +20,10 @@
variables({
:DC_NAME => node['cassandra']['datacenter_name'],
:cassandra_ip => node['Nodes']['CS'].first,
+ :cassandra_port_num => node['cassandra'][:cassandra_port],
+ :janus_connection_timeout => node['cassandra'][:janusgraph_connection_timeout],
:cassandra_pwd => node['cassandra'][:cassandra_password],
:cassandra_usr => node['cassandra'][:cassandra_user],
- :janusgraph_connection_timeout => node['cassandra']['janusgraph_connection_timeout'],
:replication_factor => node['cassandra']['replication_factor']
})
end