Upgrade SDC to use common cassandra cluster

[sdc.git] / sdc-os-chef / sdc-cassandra / chef-repo / cookbooks / cassandra-actions / recipes / 01-configureCassandra.rb

diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/01-configureCassandra.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/01-configureCassandra.rb
index 47ab456..5b05e9b 100644 (file)
--- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/01-configureCassandra.rb
+++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/01-configureCassandra.rb
@@ -1,5 +1,5 @@
 cluster_name = ''
-cluster_name = node['cassandra'][:cluster_name]+node.chef_environment
+cluster_name = node['cassandra'][:cluster_name]
 
 cas_ips=''
 cas_ips=node['Nodes'][:CS]
@@ -45,7 +45,7 @@ template "cassandra-rackdc.properties" do
     group "cassandra"
     mode "0755"
     variables ({
-        :dc => cluster_name,
-        :rack => "Rack"+"#{rackNum}-"+node.chef_environment
+        :dc => node['cassandra']['datacenter_name'],
+        :rack => "Rack"+"#{rackNum}"
     })
-end
\ No newline at end of file
+end