summaryrefslogtreecommitdiffstats
path: root/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/04-schemaCreation.rb
diff options
context:
space:
mode:
authorMichael Lando <ml636r@att.com>2018-01-08 10:52:07 +0200
committerMichael Lando <ml636r@att.com>2018-01-08 13:43:07 +0000
commit50ffa6b75d42f85bd0594e1306677eb11fb47a2c (patch)
treedf675afef0205117f7c1d4e3c1e52c68ca2db5f4 /sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/04-schemaCreation.rb
parent6f0d1e2de4bfba8c203b81c0e055c0b8c5e79060 (diff)
expose timeout setting
expose setting of time out in env.json remove the hard codeing of password in the configuration, cs password is set using the envjson. Change-Id: I09cc1f99914f444900e6b73d2ae438c72527ba2c Issue-ID: SDC-833 Signed-off-by: Michael Lando <ml636r@att.com>
Diffstat (limited to 'sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/04-schemaCreation.rb')
-rw-r--r--sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/04-schemaCreation.rb23
1 files changed, 15 insertions, 8 deletions
diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/04-schemaCreation.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/04-schemaCreation.rb
index 5890603829..0bb0027325 100644
--- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/04-schemaCreation.rb
+++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/04-schemaCreation.rb
@@ -18,7 +18,10 @@ template "titan.properties" do
source "titan.properties.erb"
mode "0755"
variables({
- :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment
+ :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment,
+ :cassandra_pwd => node['cassandra'][:cassandra_password],
+ :cassandra_usr => node['cassandra'][:cassandra_user],
+ :titan_connection_timeout => node['cassandra']['titan_connection_timeout']
})
end
@@ -28,13 +31,17 @@ template "/tmp/sdctool/config/configuration.yaml" do
source "configuration.yaml.erb"
mode 0755
variables({
- :host_ip => node['HOST_IP'],
- :catalog_port => node['BE'][:http_port],
- :ssl_port => node['BE'][:https_port],
- :cassandra_ip => node['Nodes']['CS'],
- :rep_factor => 1,
- :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment,
- :titan_Path => "/tmp/sdctool/config/"
+ :host_ip => node['HOST_IP'],
+ :catalog_port => node['BE'][:http_port],
+ :ssl_port => node['BE'][:https_port],
+ :cassandra_ip => node['Nodes']['CS'],
+ :rep_factor => 1,
+ :DC_NAME => node['cassandra'][:cluster_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'],
+ :cassandra_pwd => node['cassandra'][:cassandra_password],
+ :cassandra_usr => node['cassandra'][:cassandra_user]
})
end