Implement truststore & keystore handling for cassandra

[sdc.git] / catalog-be / src / main / docker / backend / chef-repo / cookbooks / sdc-catalog-be / recipes / BE_2_setup_configuration.rb

diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb
index a1d0df5..d2ec242 100644 (file)
--- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb
+++ b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb
@@ -30,7 +30,10 @@ template "janusgraph.properties" do
                 :DC_NAME => node['cassandra']['datacenter_name'],
                 :DC_NAME_WITH_REP => janusgraph_dcname_with_rep,
                 :janus_connection_timeout => node['cassandra']['janusgraph_connection_timeout'],
-                :cassandra_truststore_password => node['cassandra'][:truststore_password],
+                :cassandra_keystore_path => node['cassandra'][:cassandra_keystore_path],
+                :cassandra_keystore_password => node['cassandra'][:cassandra_keystore_password],
+                :cassandra_truststore_path => node['cassandra'][:cassandra_truststore_path],
+                :cassandra_truststore_password => node['cassandra'][:cassandra_truststore_password],
                 :cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}",
                 :cassandra_read_consistency_level => node['cassandra'][:read_consistency_level],
                 :cassandra_write_consistency_level => node['cassandra'][:write_consistency_level],
@@ -62,7 +65,6 @@ 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_truststore_password => node['cassandra'][:truststore_password],
                 :cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}",
                 :permittedAncestors => "#{ENV['permittedAncestors']}",
                 :dmaap_active => node['DMAAP']['active']