diff options
| author |   mahendrr <mahendra.raghuwanshi@amdocs.com> | 2019-04-18 10:39:30 +0000 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2019-04-30 18:51:18 +0000 |
| commit | f454e706d5e40bd014eb3a54acdd9fed112e0da5 (patch) | |
| tree | 88aaf08e00b437b84c8b1ba79f880d82cde516d8 /asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions | |
| parent | 20d930a11a1a08722bde76378696e7fae1ba1e5e (diff) | |
Upgrade SDC to use common cassandra cluster
Change-Id: Ib6a45de3b10cb57466b7b3ef2e18b2fe07639c0f
Issue-ID: SDC-2199
Signed-off-by: mahendrr <mahendra.raghuwanshi@amdocs.com>
Diffstat (limited to 'asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions')
3 files changed, 7 insertions, 6 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'], diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/titan.properties.erb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/titan.properties.erb index 0f31341d40..20a97be9de 100644 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/titan.properties.erb +++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/titan.properties.erb @@ -14,7 +14,7 @@ storage.cassandra.ssl.truststore.password=Aa123456 storage.cassandra.read-consistency-level=LOCAL_QUORUM storage.cassandra.write-consistency-level=LOCAL_QUORUM storage.cassandra.replication-strategy-class=org.apache.cassandra.locator.NetworkTopologyStrategy -storage.cassandra.replication-strategy-options=<%= @DC_NAME %>,1 +storage.cassandra.replication-strategy-options=<%= @DC_NAME %>,<%= @replication_factor %> storage.cassandra.astyanax.local-datacenter=<%= @DC_NAME %> cache.db-cache = false |