summaryrefslogtreecommitdiffstats
path: root/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes
diff options
context:
space:
mode:
authorTal Gitelman <tal.gitelman@att.com>2019-03-28 11:00:54 +0200
committerTal Gitelman <tal.gitelman@att.com>2019-04-04 16:33:03 +0300
commitc4d387d216e72911f80c1ebee91b73aba191b91b (patch)
treec12066b7a213d34ca7c84375fb4bb2d6f0b23138 /sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes
parentac3aca69dbeae29c9aeca2053adc7aedbb75e149 (diff)
Make Cassandra port configurable.
SDC-BE & Onboarding - BE. Reviewer: Evgenia A & Areli F. Change-Id: Iaf86d647b0560764ef65d9148c85bffaf934992d Issue-ID: SDC-2077 Signed-off-by: Tal Gitelman <tal.gitelman@att.com>
Diffstat (limited to 'sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes')
-rw-r--r--sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/01-configureCassandra.rb25
-rw-r--r--sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/02-changeCSpass.rb3
-rw-r--r--sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-prepareProbeFile.rb3
3 files changed, 17 insertions, 14 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 32e89c9b21..47ab456dec 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
@@ -21,18 +21,19 @@ template "cassandra-yaml-config" do
group "cassandra"
mode "0755"
variables ({
- :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"
+ :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
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 7afb307401..ae582cfe25 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
@@ -12,7 +12,8 @@ template "/tmp/change_cassandra_pass.sh" do
mode 0755
variables({
:cassandra_ip => application_host,
- :cassandra_pwd => ENV['CS_PASSWORD']
+ :cassandra_pwd => ENV['CS_PASSWORD'],
+ :cassandra_port => node['cassandra']['cassandra_port']
})
end
diff --git a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-prepareProbeFile.rb b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-prepareProbeFile.rb
index c196ca7b94..0165d36ef1 100644
--- a/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-prepareProbeFile.rb
+++ b/sdc-os-chef/sdc-cassandra/chef-repo/cookbooks/cassandra-actions/recipes/03-prepareProbeFile.rb
@@ -12,6 +12,7 @@ template "/var/lib/ready-probe.sh" do
mode 0755
variables({
:cassandra_ip => application_host,
- :cassandra_pwd => ENV['CS_PASSWORD']
+ :cassandra_pwd => ENV['CS_PASSWORD'],
+ :cassandra_port => node['cassandra']['cassandra_port']
})
end \ No newline at end of file