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>

2 files changed, 5 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 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'],