aboutsummaryrefslogtreecommitdiffstats
path: root/asdctool
diff options
context:
space:
mode:
authorAreli, Fuss (af732p) <af732p@intl.att.com>2018-04-24 13:59:00 +0300
committerAreli, Fuss (af732p) <af732p@att.com>2018-04-24 14:59:09 +0300
commitc033cdce906efc3b6ccd1d2f45544af47e328ed4 (patch)
tree40c4657a73d9a52f5f2784cff9a3dcb1833467ce /asdctool
parentc175a0de2f05d37c1c774684318a525eb96bb59b (diff)
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) <af732p@intl.att.com>
Diffstat (limited to 'asdctool')
-rw-r--r--asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/01-createCsUser.rb2
-rw-r--r--asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb2
-rw-r--r--asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb4
3 files changed, 4 insertions, 4 deletions
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/",