From efa3326060ac9ec70971eb7cd938c467bf76e3f5 Mon Sep 17 00:00:00 2001 From: "Areli, Fuss (af732p)" Date: Wed, 9 May 2018 15:45:03 +0300 Subject: Configuration adjustments Configuration adjustments after CI Change-Id: Id2d59ae76178f58cae6e1928a29039b2ea3b3dfa Issue-ID: SDC-1299 Signed-off-by: Areli, Fuss (af732p) --- .../cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb | 2 +- .../cookbooks/cassandra-actions/recipes/03-schemaCreation.rb | 4 ++-- .../cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb | 4 +--- .../cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb | 4 ++-- .../sdc-api-tests/recipes/sanityApiTests_2_setup_configuration.rb | 2 +- .../sdc-ui-tests/recipes/sanityUiTests_2_setup_configuration.rb | 2 +- 6 files changed, 8 insertions(+), 10 deletions(-) diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb index c9b369320c..782358bb33 100644 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb +++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/02-createDoxKeyspace.rb @@ -4,7 +4,7 @@ template "/tmp/create_dox_keyspace.sh" do mode 0755 variables({ :cassandra_ip => node['Nodes']['CS'].first, - :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment, + :DC_NAME => node['cassandra']['datacenter_name']+node.chef_environment, :cassandra_pwd => node['cassandra'][:cassandra_password], :cassandra_usr => node['cassandra'][:cassandra_user] }) diff --git a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb index faa04e57b6..d2c7a8c0a8 100644 --- a/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb +++ b/asdctool/sdc-cassandra-init/chef-repo/cookbooks/cassandra-actions/recipes/03-schemaCreation.rb @@ -18,7 +18,7 @@ template "titan.properties" do source "titan.properties.erb" mode "0755" variables({ - :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment, + :DC_NAME => node['cassandra']['datacenter_name']+node.chef_environment, :cassandra_ip => node['Nodes']['CS'].first, :cassandra_pwd => node['cassandra'][:cassandra_password], :cassandra_usr => node['cassandra'][:cassandra_user], @@ -37,7 +37,7 @@ template "/tmp/sdctool/config/configuration.yaml" do :ssl_port => node['BE'][:https_port], :cassandra_ip => node['Nodes']['CS'].first, :rep_factor => 1, - :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment, + :DC_NAME => node['cassandra']['datacenter_name']+node.chef_environment, :titan_Path => "/tmp/sdctool/config/", :socket_connect_timeout => node['cassandra']['socket_connect_timeout'], :socket_read_timeout => node['cassandra']['socket_read_timeout'], diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb index 0d1e722a70..155ea24077 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_2_setup_configuration.rb @@ -40,7 +40,6 @@ template "titan.properties" do end - template "catalog-be-config" do path "#{ENV['JETTY_BASE']}/config/catalog-be/configuration.yaml" source "BE-configuration.yaml.erb" @@ -48,7 +47,7 @@ template "catalog-be-config" do group "jetty" mode "0755" variables({ - :catalog_ip => node['BE_VIP'], + :catalog_ip => node['Nodes']['BE'], :catalog_port => node['BE'][:http_port], :ssl_port => node['BE'][:https_port], :cassandra_ip => node['Nodes']['CS'].join(",").gsub(/[|]/,''), @@ -67,7 +66,6 @@ template "catalog-be-config" do end - template "distribution-engine-configuration" do path "#{ENV['JETTY_BASE']}/config/catalog-be/distribution-engine-configuration.yaml" source "BE-distribution-engine-configuration.yaml.erb" diff --git a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb index 280eacda27..094317f014 100644 --- a/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb +++ b/catalog-fe/sdc-frontend/chef-repo/cookbooks/sdc-catalog-fe/recipes/FE_2_setup_configuration.rb @@ -5,8 +5,8 @@ template "catalog-fe-config" do group "jetty" mode "0755" variables({ - :fe_host_ip => node['Nodes']['FE'], - :be_host_ip => node['Nodes']['BE'], + :fe_host_ip => node['FE_VIP'], + :be_host_ip => node['BE_VIP'], :kb_host_ip => node['Nodes']['KB'], :catalog_port => node['BE'][:http_port], :ssl_port => node['BE'][:https_port], diff --git a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/recipes/sanityApiTests_2_setup_configuration.rb b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/recipes/sanityApiTests_2_setup_configuration.rb index f2c295ceea..7321155232 100644 --- a/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/recipes/sanityApiTests_2_setup_configuration.rb +++ b/test-apis-ci/sdc-api-tests/chef-repo/cookbooks/sdc-api-tests/recipes/sanityApiTests_2_setup_configuration.rb @@ -40,4 +40,4 @@ template "titan.properties" do :rep_factor => replication_factor, :DC_NAME => node['cassandra']['datacenter_name']+node.chef_environment }) -end \ No newline at end of file +end 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 20fd1185aa..8bef97c7b5 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 @@ -40,4 +40,4 @@ template "titan.properties" do :rep_factor => replication_factor, :DC_NAME => node['cassandra']['datacenter_name']+node.chef_environment }) -end \ No newline at end of file +end -- cgit 1.2.3-korg