diff options
| author |   Areli, Fuss (af732p) <af732p@intl.att.com> | 2018-04-24 13:59:00 +0300 |
|---|---|---|
| committer |   Areli, Fuss (af732p) <af732p@att.com> | 2018-04-24 14:59:09 +0300 |
| commit | c033cdce906efc3b6ccd1d2f45544af47e328ed4 (patch) | |
| tree | 40c4657a73d9a52f5f2784cff9a3dcb1833467ce /catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb | |
| parent | c175a0de2f05d37c1c774684318a525eb96bb59b (diff) | |
Add cluster resiliance support
Add configuration support for CS/ES cluster
and add truststore default files to support
ssl connection
Change-Id: Icc2831704e8a3c55ce9b380a39001891ce8d41ab
Issue-ID: SDC-1254
Signed-off-by: Areli, Fuss (af732p) <af732p@intl.att.com>
Diffstat (limited to 'catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb')
| -rw-r--r-- | catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb index 3bad06f6fb..2ba89801c4 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb @@ -16,13 +16,13 @@ template "titan.properties" do group "jetty" mode "0755" variables({ - :CASSANDRA_IP => node['Nodes']['CS'], - :CASSANDRA_PWD => node['cassandra'][:cassandra_password], - :CASSANDRA_USR => node['cassandra'][:cassandra_user], + :cassandra_ip => node['Nodes']['CS'].join(",").gsub(/[|]/,''), + :cassandra_pwd => node['cassandra'][:cassandra_password], + :cassandra_usr => node['cassandra'][:cassandra_user], :rep_factor => replication_factor, :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment, :titan_connection_timeout => node['cassandra']['titan_connection_timeout'], - :cassandra_traststore_password => node['cassandra'][:truststore_password], + :cassandra_truststore_password => node['cassandra'][:truststore_password], :cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}" }) end @@ -38,7 +38,7 @@ template "catalog-be-config" do :catalog_ip => node['Nodes']['BE'], :catalog_port => node['BE'][:http_port], :ssl_port => node['BE'][:https_port], - :cassandra_ip => node['Nodes']['CS'], + :cassandra_ip => node['Nodes']['CS'].join(",").gsub(/[|]/,''), :rep_factor => replication_factor, :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment, :titan_Path => "/var/lib/jetty/config/catalog-be/", @@ -46,7 +46,7 @@ template "catalog-be-config" do :socket_read_timeout => node['cassandra']['socket_read_timeout'], :cassandra_pwd => node['cassandra'][:cassandra_password], :cassandra_usr => node['cassandra'][:cassandra_user], - :cassandra_traststore_password => node['cassandra'][:truststore_password], + :cassandra_truststore_password => node['cassandra'][:truststore_password], :cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}" }) end |