diff options
Diffstat (limited to 'catalog-be/sdc-backend/chef-repo')
2 files changed, 15 insertions, 15 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 a0a6bc06d4..3ec26cf2dd 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 @@ -24,12 +24,13 @@ template "janusgraph.properties" do mode "0755" variables({ :cassandra_ip => node['Nodes']['CS'].join(",").gsub(/[|]/,''), + :cassandra_cql_port => node['cassandra'][:cassandra_port], :cassandra_pwd => node['cassandra'][:cassandra_password], :cassandra_usr => node['cassandra'][:cassandra_user], :rep_factor => replication_factor, :DC_NAME => node['cassandra']['datacenter_name'], :DC_NAME_WITH_REP => janusgraph_dcname_with_rep, - :janusgraph_connection_timeout => node['cassandra']['janusgraph_connection_timeout'], + :janus_connection_timeout => node['cassandra']['janusgraph_connection_timeout'], :cassandra_truststore_password => node['cassandra'][:truststore_password], :cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}" }) diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-janusgraph.properties.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-janusgraph.properties.erb index e091052709..0a9dd073c0 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-janusgraph.properties.erb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-janusgraph.properties.erb @@ -1,20 +1,20 @@ -storage.backend=cassandra +storage.backend=cql storage.hostname=<%= @cassandra_ip %> -storage.port=9160 +storage.port=<%= @cassandra_cql_port %> storage.username=<%= @cassandra_usr %> storage.password=<%= @cassandra_pwd %> -storage.connection-timeout=<%= @janusgraph_connection_timeout %> -storage.cassandra.keyspace=sdctitan +storage.connection-timeout=<%= @janus_connection_timeout %> +storage.cql.keyspace=sdctitan -storage.cassandra.ssl.enabled=<%= @cassandra_ssl_enabled %> -storage.cassandra.ssl.truststore.location=/var/lib/jetty/etc/truststore -storage.cassandra.ssl.truststore.password=<%= @cassandra_truststore_password %> +storage.cql.ssl.enabled=<%= @cassandra_ssl_enabled %> +storage.cql.ssl.truststore.location=<%= @cassandra_truststore_path %> +storage.cql.ssl.truststore.password=<%= @cassandra_truststore_password %> -storage.cassandra.read-consistency-level=LOCAL_QUORUM -storage.cassandra.write-consistency-level=LOCAL_QUORUM -storage.cassandra.replication-strategy-class=org.apache.cassandra.locator.NetworkTopologyStrategy -storage.cassandra.replication-strategy-options=<%= @DC_NAME_WITH_REP %> -storage.cassandra.astyanax.local-datacenter=<%= @DC_NAME %> +storage.cql.read-consistency-level=LOCAL_QUORUM +storage.cql.write-consistency-level=LOCAL_QUORUM +storage.cql.replication-strategy-class=NetworkTopologyStrategy +storage.cql.replication-strategy-options=<%= @DC_NAME_WITH_REP %> +storage.cql.local-datacenter=<%= @DC_NAME %> cache.db-cache = false @@ -24,5 +24,4 @@ cache.db-cache-size = 0.5 cache.tx-cache-size = 1000000 -storage.lock.retries=5 -storage.lock.wait-time=500 +storage.lock.retries=5
\ No newline at end of file |