From c033cdce906efc3b6ccd1d2f45544af47e328ed4 Mon Sep 17 00:00:00 2001 From: "Areli, Fuss (af732p)" Date: Tue, 24 Apr 2018 13:59:00 +0300 Subject: Add cluster resiliance support Add configuration support for CS/ES cluster and add truststore default files to support ssl connection Change-Id: Icc2831704e8a3c55ce9b380a39001891ce8d41ab Issue-ID: SDC-1254 Signed-off-by: Areli, Fuss (af732p) --- .../chef-repo/cookbooks/cassandra-actions/recipes/01-createCsUser.rb | 2 +- .../cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb | 2 +- .../cookbooks/cassandra-actions/recipes/03-schemaCreation.rb | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'asdctool') diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/01-createCsUser.rb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/01-createCsUser.rb index 2eb6d58cc3..d14e9a2232 100644 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/01-createCsUser.rb +++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/01-createCsUser.rb @@ -3,7 +3,7 @@ template "/tmp/create_cassandra_user.sh" do sensitive true mode 0755 variables({ - :cassandra_ip => node['Nodes']['CS'], + :cassandra_ip => node['Nodes']['CS'].first, :cassandra_pwd => ENV['CS_PASSWORD'], :sdc_usr => ENV['SDC_USER'], :sdc_pwd => ENV['SDC_PASSWORD'] 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 87edf8c358..c9b369320c 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 @@ -3,7 +3,7 @@ template "/tmp/create_dox_keyspace.sh" do sensitive true mode 0755 variables({ - :cassandra_ip => node['Nodes']['CS'], + :cassandra_ip => node['Nodes']['CS'].first, :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment, :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 ea8daf02ec..faa04e57b6 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 @@ -19,7 +19,7 @@ template "titan.properties" do mode "0755" variables({ :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment, - :cassandra_ip => node['Nodes']['CS'], + :cassandra_ip => node['Nodes']['CS'].first, :cassandra_pwd => node['cassandra'][:cassandra_password], :cassandra_usr => node['cassandra'][:cassandra_user], :titan_connection_timeout => node['cassandra']['titan_connection_timeout'] @@ -35,7 +35,7 @@ template "/tmp/sdctool/config/configuration.yaml" do :host_ip => node['Nodes']['BE'], :catalog_port => node['BE'][:http_port], :ssl_port => node['BE'][:https_port], - :cassandra_ip => node['Nodes']['CS'], + :cassandra_ip => node['Nodes']['CS'].first, :rep_factor => 1, :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment, :titan_Path => "/tmp/sdctool/config/", -- cgit 1.2.3-korg