diff options
| author |   marine <marine.de.dorlodot@intl.att.com> | 2021-07-08 11:57:27 +0200 |
|---|---|---|
| committer |   Michael Morris <michael.morris@est.tech> | 2021-07-13 13:45:54 +0000 |
| commit | 84f4b054a72b7d1dd44dec5d91623595e4563ab7 (patch) | |
| tree | dfcd0c8167108ad231f9248ebec74549764ee36f /catalog-be/src/main | |
| parent | 6047cd212696f5260d1296ce1fc3449dadb6005d (diff) | |
Exposing new parameters in chef config for SDC
Issue-ID: SDC-3633
Change-Id: Ib59ecbe151b3d7fb5b52241102f5c7dfc520003b
Signed-off-by: xuegao <xue.gao@intl.att.com>
Diffstat (limited to 'catalog-be/src/main')
3 files changed, 11 insertions, 5 deletions
diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb index dc7d77b0ab..a3e519826c 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb +++ b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb @@ -35,6 +35,9 @@ default['cassandra']['socket_connect_timeout'] = 20000 default['cassandra']['janusgraph_connection_timeout'] = 10000 default['cassandra'][:truststore_password] = "Aa123456" default['cassandra']['janusgraph_config_file'] = "#{ENV['JETTY_BASE']}/config/catalog-be/janusgraph.properties" +default['cassandra'][:db_cache] = true +default['cassandra'][:read_consistency_level] = "ONE" +default['cassandra'][:write_consistency_level] = "ALL" #Onboard 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 6522577881..83dc113329 100644 --- 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 @@ -31,8 +31,11 @@ template "janusgraph.properties" do :DC_NAME_WITH_REP => janusgraph_dcname_with_rep, :janus_connection_timeout => node['cassandra']['janusgraph_connection_timeout'], :cassandra_truststore_password => node['cassandra'][:truststore_password], - :cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}" - }) + :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], + :cassandra_db_cache => node['cassandra'][:db_cache] + }) end template "catalog-be-config" do diff --git a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-janusgraph.properties.erb b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-janusgraph.properties.erb index 0a9dd073c0..ddbec02a79 100644 --- a/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-janusgraph.properties.erb +++ b/catalog-be/src/main/docker/backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-janusgraph.properties.erb @@ -10,14 +10,14 @@ storage.cql.ssl.enabled=<%= @cassandra_ssl_enabled %> storage.cql.ssl.truststore.location=<%= @cassandra_truststore_path %> storage.cql.ssl.truststore.password=<%= @cassandra_truststore_password %> -storage.cql.read-consistency-level=LOCAL_QUORUM -storage.cql.write-consistency-level=LOCAL_QUORUM +storage.cql.read-consistency-level=<%= @cassandra_read_consistency_level %> +storage.cql.write-consistency-level=<%= @cassandra_write_consistency_level %> 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 +cache.db-cache = <%= @cassandra_db_cache %> cache.db-cache-clean-wait = 20 cache.db-cache-time = 180000 cache.db-cache-size = 0.5 |