aboutsummaryrefslogtreecommitdiffstats
path: root/ui-ci/sdc-ui-tests/chef-repo/cookbooks
diff options
context:
space:
mode:
authorAreli, Fuss (af732p) <af732p@intl.att.com>2018-04-24 13:59:00 +0300
committerAreli, Fuss (af732p) <af732p@att.com>2018-04-24 14:59:09 +0300
commitc033cdce906efc3b6ccd1d2f45544af47e328ed4 (patch)
tree40c4657a73d9a52f5f2784cff9a3dcb1833467ce /ui-ci/sdc-ui-tests/chef-repo/cookbooks
parentc175a0de2f05d37c1c774684318a525eb96bb59b (diff)
Add cluster resiliance support
Add configuration support for CS/ES cluster and add truststore default files to support ssl connection Change-Id: Icc2831704e8a3c55ce9b380a39001891ce8d41ab Issue-ID: SDC-1254 Signed-off-by: Areli, Fuss (af732p) <af732p@intl.att.com>
Diffstat (limited to 'ui-ci/sdc-ui-tests/chef-repo/cookbooks')
-rw-r--r--ui-ci/sdc-ui-tests/chef-repo/cookbooks/sdc-ui-tests/recipes/sanityUiTests_2_setup_configuration.rb4
1 files changed, 2 insertions, 2 deletions
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 083c6609d5..ca66b8c46a 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
@@ -19,7 +19,7 @@ template "sdc-yaml-config" do
:importResourceTestsConfigDir => "#{tests_base}/CI/importResourceTests",
:ConfigurationFile => "#{tests_base}/conf/configuration.yaml",
:errorConfigurationFile => "#{tests_base}/conf/error-configuration.yaml",
- :CASSANDRA_IP => node['Nodes']['CS'],
+ :CASSANDRA_IP => node['Nodes']['CS'].join(",").gsub(/[|]/,''),
:CASSANDRA_PWD => node['cassandra'][:cassandra_password],
:CASSANDRA_USR => node['cassandra'][:cassandra_user],
:ES_IP => node['Nodes']['ES']
@@ -34,7 +34,7 @@ template "titan.properties" do
group "root"
mode "0755"
variables({
- :CASSANDRA_IP => node['Nodes']['CS'],
+ :CASSANDRA_IP => node['Nodes']['CS'].join(",").gsub(/[|]/,''),
:CASSANDRA_PWD => node['cassandra'][:cassandra_password],
:CASSANDRA_USR => node['cassandra'][:cassandra_user],
:rep_factor => replication_factor,