From 5b593496b8f1b8e8be8d7d2dbcc223332e65a49b Mon Sep 17 00:00:00 2001 From: Michael Lando Date: Sun, 29 Jul 2018 16:13:45 +0300 Subject: re base code Change-Id: I12a5ca14a6d8a87e9316b9ff362eb131105f98a5 Issue-ID: SDC-1566 Signed-off-by: Michael Lando --- .../cookbooks/sdc-onboard-backend/attributes/default.rb | 9 +++++++++ .../sdc-onboard-backend/recipes/ON_5_setup_configuration.rb | 4 ++-- .../sdc-onboard-backend/templates/default/configuration.yaml.erb | 2 +- 3 files changed, 12 insertions(+), 3 deletions(-) (limited to 'openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo') diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/attributes/default.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/attributes/default.rb index 47c3e2991a..cecc7ef5f4 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/attributes/default.rb +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/attributes/default.rb @@ -8,3 +8,12 @@ default['cassandra'][:truststore_password] = "Aa123456" default['jetty'][:keystore_pwd] = "OBF:1cp61iuj194s194u194w194y1is31cok" default['jetty'][:keymanager_pwd] = "OBF:1cp61iuj194s194u194w194y1is31cok" default['jetty'][:truststore_pwd] = "OBF:1cp61iuj194s194u194w194y1is31cok" +default['VnfRepo']['vnfRepoPort'] = 8702 +default['VnfRepo']['vnfRepoHost'] = "192.168.50.5" + +#Cassandra +default['cassandra']['datacenter_name'] = "DC-" +default['cassandra']['cluster_name'] = "SDC-CS-" +default['cassandra']['socket_read_timeout'] = 20000 +default['cassandra']['socket_connect_timeout'] = 20000 +default['cassandra']['titan_connection_timeout'] = 10000 diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_5_setup_configuration.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_5_setup_configuration.rb index 747c735b84..b729ae777c 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_5_setup_configuration.rb +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_5_setup_configuration.rb @@ -9,7 +9,7 @@ template "onboard-be-config" do :onboard_port => node['ONBOARDING_BE'][:http_port], :ssl_port => node['ONBOARDING_BE'][:https_port], :cassandra_ip => node['Nodes']['CS'].join(",").gsub(/[|]/,''), - :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment, + :DC_NAME => node['cassandra']['datacenter_name']+node.chef_environment, :socket_connect_timeout => node['cassandra']['socket_connect_timeout'], :socket_read_timeout => node['cassandra']['socket_read_timeout'], :cassandra_pwd => node['cassandra'][:cassandra_password], @@ -31,4 +31,4 @@ template "VnfrepoConfiguration" do :VNFREPO_IP => node['VnfRepo']['vnfRepoHost'], :VNFREPO_PORT => node['VnfRepo']['vnfRepoPort'] }) -end \ No newline at end of file +end diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/configuration.yaml.erb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/configuration.yaml.erb index df1c7b516e..a2f0bbd3bf 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/configuration.yaml.erb +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/configuration.yaml.erb @@ -14,7 +14,7 @@ cassandraConfig: username: <%= @cassandra_usr %> password: <%= @cassandra_pwd %> ssl: <%= @cassandra_ssl_enabled %> - truststorePath: /config/truststore + truststorePath: /var/lib/jetty/etc/truststore truststorePassword: <%= @cassandra_truststore_password %> -- cgit 1.2.3-korg