Configuration adjustments
Configuration adjustments after CI
Change-Id: Id2d59ae76178f58cae6e1928a29039b2ea3b3dfa
Issue-ID: SDC-1299
Signed-off-by: Areli, Fuss (af732p) <af732p@att.com>
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 c9b3693..782358b 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
@@ -4,7 +4,7 @@
mode 0755
variables({
:cassandra_ip => node['Nodes']['CS'].first,
- :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment,
+ :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 faa04e5..d2c7a8c 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,7 +18,7 @@
source "titan.properties.erb"
mode "0755"
variables({
- :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment,
+ :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],
@@ -37,7 +37,7 @@
:ssl_port => node['BE'][:https_port],
:cassandra_ip => node['Nodes']['CS'].first,
:rep_factor => 1,
- :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment,
+ :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'],