diff options
Diffstat (limited to 'ui-ci/sdc-ui-tests/chef-repo')
3 files changed, 16 insertions, 18 deletions
diff --git a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/conf/log4j.properties b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/conf/log4j.properties index 02f783076a..31c4ba091b 100644 --- a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/conf/log4j.properties +++ b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/files/default/conf/log4j.properties @@ -26,7 +26,7 @@ log4j.appender.stdout.layout=org.apache.log4j.PatternLayout log4j.appender.stdout.layout.ConversionPattern=%d{yyyy-MM-dd HH:mm:ss} %5p %10c:%L - %m%n log4j.logger.org.apache.cassandra.service.StorageProxy=INFO -log4j.logger.org.janusgraph.diskstorage.cassandra.CassandraTransaction=INFO, FILE, stdout +log4j.logger.org.janusgraph.diskstorage.cql.CassandraTransaction=INFO, FILE, stdout log4j.logger.org.openecomp.sdc.ci.tests.utils=INFO, FILE, stdout log4j.additivity.org.openecomp.sdc.ci.tests.utils=false diff --git a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_2_setup_configuration.rb b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_2_setup_configuration.rb index 50a953081a..aa676a69a6 100644 --- a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_2_setup_configuration.rb +++ b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_2_setup_configuration.rb @@ -20,6 +20,7 @@ template "sdc-yaml-config" do :ConfigurationFile => "#{tests_base}/conf/configuration.yaml", :errorConfigurationFile => "#{tests_base}/conf/error-configuration.yaml", :CASSANDRA_IP => node['Nodes']['CS'].join(",").gsub(/[|]/,''), + :CASSANDRA_PORT => node['cassandra'][:cassandra_port], :CASSANDRA_PWD => node['cassandra'][:cassandra_password], :CASSANDRA_USR => node['cassandra'][:cassandra_user], :ES_IP => node['Nodes']['ES'] @@ -34,6 +35,7 @@ template "janusgraph.properties" do mode "0755" variables({ :CASSANDRA_IP => node['Nodes']['CS'].join(",").gsub(/[|]/,''), + :CASSANDRA_PORT => node['cassandra'][[:cassandra_port], :CASSANDRA_PWD => node['cassandra'][:cassandra_password], :CASSANDRA_USR => node['cassandra'][:cassandra_user], :rep_factor => node['cassandra']['replication_factor'], diff --git a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/BE-janusgraph.properties.erb b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/BE-janusgraph.properties.erb index a42c7bf206..31a6614910 100644 --- a/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/BE-janusgraph.properties.erb +++ b/ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/templates/default/BE-janusgraph.properties.erb @@ -1,25 +1,21 @@ -storage.backend=cassandra + +storage.backend=cql storage.hostname=<%= @CASSANDRA_IP %> -storage.port=9160 +storage.port=<%= @CASSANDRA_PORT %> storage.username=<%= @CASSANDRA_USR %> storage.password=<%= @CASSANDRA_PWD %> storage.connection-timeout=10000 -storage.cassandra.keyspace=sdctitan - -storage.cassandra.ssl.enabled=false -storage.cassandra.ssl.truststore.location=/var/lib/jetty/config/.truststore -storage.cassandra.ssl.truststore.password=Aa123456 - +storage.cql.keyspace=sdctitan +storage.cql.ssl.enabled=false +storage.cql.ssl.truststore.location=/var/lib/jetty/config/.truststore +storage.cql.ssl.truststore.password=Aa123456 cache.db-cache = false cache.db-cache-clean-wait = 20 cache.db-cache-time = 180000 cache.db-cache-size = 0.5 - -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 %>,<%= @rep_factor %> -storage.cassandra.astyanax.local-datacenter=<%= @DC_NAME %> - -storage.lock.retries=5 -storage.lock.wait-time=500 +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 %>,<%= @rep_factor %> +storage.cql.local-datacenter=<%= @DC_NAME %> +storage.lock.wait-time=500
\ No newline at end of file |