diff options
| author |   Sonsino, Ofir (os0695) <os0695@intl.att.com> | 2019-04-14 12:41:54 +0300 |
|---|---|---|
| committer | Sonsino, Ofir (os0695) <os0695@intl.att.com> | 2019-04-14 12:41:54 +0300 |
| commit | b08309847c24bd3c060839a335a20cb3f750ed30 (patch) | |
| tree | a4d87f251d14dabb769987f3e5b3214861d2fc8b /asdctool | |
| parent | 962b8610448d6cec8f12045e09b4adac3aefbf4c (diff) | |
Revert "Upgrade SDC to use common cassandra cluster"
This reverts commit 00a6a4d66b0d22d530314816b4b5697fbc975e37.
Change-Id: I308844556aea66e91064d9067e3ba54179a0bb46
Issue-ID: SDC-2199
Signed-off-by: Sonsino, Ofir (os0695) <os0695@intl.att.com>
Diffstat (limited to 'asdctool')
3 files changed, 6 insertions, 7 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 a516c7108b..c9a4087671 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'], + :DC_NAME => node['cassandra']['datacenter_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 fbfcb2ecea..b48eecd9b0 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,12 +18,11 @@ template "titan.properties" do source "titan.properties.erb" mode "0755" variables({ - :DC_NAME => node['cassandra']['datacenter_name'], + :DC_NAME => node['cassandra']['datacenter_name']+node.chef_environment, :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'], - :replication_factor => node['cassandra']['replication_factor'] + :titan_connection_timeout => node['cassandra']['titan_connection_timeout'] }) end @@ -38,8 +37,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 => node['cassandra']['replication_factor'], - :DC_NAME => node['cassandra']['datacenter_name'], + :rep_factor => 1, + :DC_NAME => node['cassandra']['datacenter_name']+node.chef_environment, :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 20a97be9de..0f31341d40 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 %>,<%= @replication_factor %> +storage.cassandra.replication-strategy-options=<%= @DC_NAME %>,1 storage.cassandra.astyanax.local-datacenter=<%= @DC_NAME %> cache.db-cache = false |