aboutsummaryrefslogtreecommitdiffstats
path: root/asdctool
diff options
context:
space:
mode:
authorAreli, Fuss (af732p) <af732p@att.com>2018-05-09 15:45:03 +0300
committerMichael Lando <ml636r@att.com>2018-09-05 14:55:27 +0000
commitefa3326060ac9ec70971eb7cd938c467bf76e3f5 (patch)
tree859d7e635301a4b759ae68d0b3b4d7d61815da16 /asdctool
parent5c9769c3e3a6d6675c5ec1bd450720791ef2793c (diff)
Configuration adjustments
Configuration adjustments after CI Change-Id: Id2d59ae76178f58cae6e1928a29039b2ea3b3dfa Issue-ID: SDC-1299 Signed-off-by: Areli, Fuss (af732p) <af732p@att.com>
Diffstat (limited to 'asdctool')
-rw-r--r--asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb2
-rw-r--r--asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb4
2 files changed, 3 insertions, 3 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 c9b369320c..782358bb33 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 @@ template "/tmp/create_dox_keyspace.sh" do
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 faa04e57b6..d2c7a8c0a8 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 @@ template "titan.properties" do
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 @@ template "/tmp/sdctool/config/configuration.yaml" do
: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'],