Exposing new parameters in chef config for SDC

Issue-ID: SDC-3633

Change-Id: Ib59ecbe151b3d7fb5b52241102f5c7dfc520003b
Signed-off-by: xuegao <xue.gao@intl.att.com>

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 dc7d77b..a3e5198 100644 (file)
--- 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 6522577..83dc113 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
@@ -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 0a9dd07..ddbec02 100644 (file)
--- 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

diff --git a/integration-tests/pom.xml b/integration-tests/pom.xml
index e6e1bba..c3745b6 100644 (file)
--- a/integration-tests/pom.xml
+++ b/integration-tests/pom.xml
@@ -543,7 +543,7 @@ limitations under the License.
                             <name>onap/sdc-onboard-backend:${it.docker.version}</name>
                             <alias>sdc-onboard-backend</alias>
                             <run>
-                                <dependsOn>
+                               <dependsOn>
                                     <container>sdc-cassandra-onboard-init</container>
                                 </dependsOn>
                                 <env>
@@ -752,7 +752,7 @@ limitations under the License.
                                 </wait>
                                 <ports>
                                     <!-- http://localhost:8285/login to access SDC -->
-                                    <port>8285:8080</port>
+                                   <port>8285:8080</port>
                                     <port>8286:8443</port>
                                 </ports>
                                 <network>