diff options
Diffstat (limited to 'sdc-os-chef')
2 files changed, 18 insertions, 18 deletions
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 5b05e9be57..21d43b18ef 100644 --- 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 @@ -20,20 +20,20 @@ template "cassandra-yaml-config" do owner "cassandra" group "cassandra" mode "0755" - variables ({ - :cassandra_port => node['cassandra']['cassandra_port'], - :cassandra_cluster => cluster_name, - :cassandra_data_dir => node['cassandra'][:data_dir], - :cassandra_commitlog_dir => node['cassandra'][:commitlog_dir], - :cassandra_cache_dir => node['cassandra'][:cache_dir], - :seeds_address => cas_ips, - :listen_address => application_host, - :broadcast_address => application_host, - :broadcast_rpc_address => application_host, - :rpc_address => "0.0.0.0", - :num_tokens => node['cassandra'][:num_tokens], - :internode_encryption => "none", - :cassandra_truststore_dir => "/etc/cassandra/cs_trust" + variables({ + :cassandra_port => node['cassandra']['cassandra_port'], + :cassandra_cluster => cluster_name, + :cassandra_data_dir => node['cassandra'][:data_dir], + :cassandra_commitlog_dir => node['cassandra'][:commitlog_dir], + :cassandra_cache_dir => node['cassandra'][:cache_dir], + :seeds_address => cas_ips, + :listen_address => application_host, + :broadcast_address => application_host, + :broadcast_rpc_address => application_host, + :rpc_address => "0.0.0.0", + :num_tokens => node['cassandra'][:num_tokens], + :internode_encryption => "none", + :cassandra_truststore_dir => "/etc/cassandra/cs_trust" }) end @@ -44,7 +44,7 @@ template "cassandra-rackdc.properties" do owner "cassandra" group "cassandra" mode "0755" - variables ({ + variables({ :dc => node['cassandra']['datacenter_name'], :rack => "Rack"+"#{rackNum}" }) diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/02-changeCSpass.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/02-changeCSpass.rb index ae582cfe25..8ebdeef7dd 100644 --- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/02-changeCSpass.rb +++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/02-changeCSpass.rb @@ -11,9 +11,9 @@ template "/tmp/change_cassandra_pass.sh" do sensitive true mode 0755 variables({ - :cassandra_ip => application_host, - :cassandra_pwd => ENV['CS_PASSWORD'], - :cassandra_port => node['cassandra']['cassandra_port'] + :cassandra_ip => application_host, + :cassandra_pwd => ENV['CS_PASSWORD'], + :cassandra_port => node['cassandra']['cassandra_port'] }) end |