diff options
| author |   Mahendra Raghuwanshi <mahendra.raghuwanshi@amdocs.com> | 2019-03-21 04:19:23 +0000 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2019-04-10 16:48:13 +0000 |
| commit | 00a6a4d66b0d22d530314816b4b5697fbc975e37 (patch) | |
| tree | 38f2713fb1f392f2d4b7318f20c85979fffc9d92 /asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes | |
| parent | c39136c8094f3866070627fd461b5871fea9faa3 (diff) | |
Upgrade SDC to use common cassandra cluster
Issue-ID: SDC-2199
Change-Id: I139f38f3f3d968b775c9962bfe3ad6d13ea7f678
Signed-off-by: Mahendra Raghuwanshi <mahendra.raghuwanshi@amdocs.com>
Diffstat (limited to 'asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes')
2 files changed, 6 insertions, 5 deletions
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 c9a4087671..a516c7108b 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 @@ -5,7 +5,7 @@ template "/tmp/create_dox_keyspace.sh" do variables({ :cassandra_ip => node['Nodes']['CS'].first, :cassandra_port => node['cassandra']['cassandra_port'], - :DC_NAME => node['cassandra']['datacenter_name']+node.chef_environment, + :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 b48eecd9b0..fbfcb2ecea 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 @@ -18,11 +18,12 @@ template "titan.properties" do source "titan.properties.erb" mode "0755" variables({ - :DC_NAME => node['cassandra']['datacenter_name']+node.chef_environment, + :DC_NAME => node['cassandra']['datacenter_name'], :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'] + :titan_connection_timeout => node['cassandra']['titan_connection_timeout'], + :replication_factor => node['cassandra']['replication_factor'] }) end @@ -37,8 +38,8 @@ template "/tmp/sdctool/config/configuration.yaml" do :ssl_port => node['BE'][:https_port], :cassandra_ip => node['Nodes']['CS'].first, :cassandra_port => node['cassandra']['cassandra_port'], - :rep_factor => 1, - :DC_NAME => node['cassandra']['datacenter_name']+node.chef_environment, + :rep_factor => node['cassandra']['replication_factor'], + :DC_NAME => node['cassandra']['datacenter_name'], :titan_Path => "/tmp/sdctool/config/", :socket_connect_timeout => node['cassandra']['socket_connect_timeout'], :socket_read_timeout => node['cassandra']['socket_read_timeout'], |