From c4d387d216e72911f80c1ebee91b73aba191b91b Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Thu, 28 Mar 2019 11:00:54 +0200 Subject: 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 --- .../cookbooks/cassandra-actions/recipes/01-createCsUser.rb | 9 +++++---- .../cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb | 9 +++++---- .../cookbooks/cassandra-actions/recipes/03-schemaCreation.rb | 1 + 3 files changed, 11 insertions(+), 8 deletions(-) (limited to 'asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes') diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/01-createCsUser.rb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/01-createCsUser.rb index d14e9a2232..84b0cb2b40 100644 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/01-createCsUser.rb +++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/01-createCsUser.rb @@ -3,10 +3,11 @@ template "/tmp/create_cassandra_user.sh" do sensitive true mode 0755 variables({ - :cassandra_ip => node['Nodes']['CS'].first, - :cassandra_pwd => ENV['CS_PASSWORD'], - :sdc_usr => ENV['SDC_USER'], - :sdc_pwd => ENV['SDC_PASSWORD'] + :cassandra_ip => node['Nodes']['CS'].first, + :cassandra_port => node['cassandra']['cassandra_port'], + :cassandra_pwd => ENV['CS_PASSWORD'], + :sdc_usr => ENV['SDC_USER'], + :sdc_pwd => ENV['SDC_PASSWORD'] }) end 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 782358bb33..c9a4087671 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 @@ -3,10 +3,11 @@ template "/tmp/create_dox_keyspace.sh" do sensitive true mode 0755 variables({ - :cassandra_ip => node['Nodes']['CS'].first, - :DC_NAME => node['cassandra']['datacenter_name']+node.chef_environment, - :cassandra_pwd => node['cassandra'][:cassandra_password], - :cassandra_usr => node['cassandra'][:cassandra_user] + :cassandra_ip => node['Nodes']['CS'].first, + :cassandra_port => node['cassandra']['cassandra_port'], + :DC_NAME => node['cassandra']['datacenter_name']+node.chef_environment, + :cassandra_pwd => node['cassandra'][:cassandra_password], + :cassandra_usr => node['cassandra'][:cassandra_user] }) end 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 d2c7a8c0a8..b48eecd9b0 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 @@ -36,6 +36,7 @@ template "/tmp/sdctool/config/configuration.yaml" do :catalog_port => node['BE'][:http_port], :ssl_port => node['BE'][:https_port], :cassandra_ip => node['Nodes']['CS'].first, + :cassandra_port => node['cassandra']['cassandra_port'], :rep_factor => 1, :DC_NAME => node['cassandra']['datacenter_name']+node.chef_environment, :titan_Path => "/tmp/sdctool/config/", -- cgit 1.2.3-korg