diff options
| author |   k.kedron <k.kedron@partner.samsung.com> | 2020-03-13 17:15:14 +0100 |
|---|---|---|
| committer |   Ofir Sonsino <ofir.sonsino@intl.att.com> | 2020-03-16 12:41:32 +0000 |
| commit | 4654da998f4cd9390e2e1a02f4aa2bdf198893c0 (patch) | |
| tree | d3db0f41c25d8a8eaedb53dcdcf3d780034cc472 /asdctool | |
| parent | a2abf6ea18d512d367277bacaf7476754dc0eff5 (diff) | |
Remove hardcoded timeout
Added configuration for wait seconds for Cassandra connector.
Also, increase the timeout value to prevent tests failed.
Issue-ID: SDC-2759
Signed-off-by: Krystian Kedron <k.kedron@partner.samsung.com>
Change-Id: I1008ecce98efdd8627ac3232b35fecd2a41a9c79
Diffstat (limited to 'asdctool')
3 files changed, 2 insertions, 1 deletions
diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb index 5147881bde..90a02934b5 100644 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb +++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/templates/default/configuration.yaml.erb @@ -83,6 +83,7 @@ cassandraConfig: ssl: false truststorePath : /config/.truststore truststorePassword : Aa123456 + maxWaitSeconds: 120 keySpaces: - { name: dox, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @DC_NAME %>','<%= @rep_factor %>']} - { name: sdcaudit, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['<%= @DC_NAME %>','<%= @rep_factor %>']} diff --git a/asdctool/src/main/resources/config/configuration.yaml b/asdctool/src/main/resources/config/configuration.yaml index 69f82ac72f..5a88cf040a 100644 --- a/asdctool/src/main/resources/config/configuration.yaml +++ b/asdctool/src/main/resources/config/configuration.yaml @@ -99,6 +99,7 @@ cassandraConfig: ssl: true truststorePath : C:/Users/im453s/git/vagrant-sdc-all-in-one/tmp.trust truststorePassword : Aa123456 + maxWaitSeconds: 120 keySpaces: - { name: dox, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['DC-AIO-Ubuntu1', '1']} - { name: sdcaudit, replicationStrategy: NetworkTopologyStrategy, replicationInfo: ['DC-AIO-Ubuntu1', '1']} diff --git a/asdctool/src/main/resources/config/janusgraph.properties b/asdctool/src/main/resources/config/janusgraph.properties index e0b844f554..8462756129 100644 --- a/asdctool/src/main/resources/config/janusgraph.properties +++ b/asdctool/src/main/resources/config/janusgraph.properties @@ -16,7 +16,6 @@ storage.cql.replication-strategy-class=org.apache.cassandra.locator.NetworkTopol storage.cql.replication-strategy-options=DC-sdc-iltlv633,1 storage.cql.local-datacenter=DC-sdc-iltlv633 - cache.db-cache = false cache.db-cache-clean-wait = 20 cache.db-cache-time = 180000 |