diff options
| author |   Areli, Fuss (af732p) <af732p@intl.att.com> | 2018-04-24 13:59:00 +0300 |
|---|---|---|
| committer |   Areli, Fuss (af732p) <af732p@att.com> | 2018-04-24 14:59:09 +0300 |
| commit | c033cdce906efc3b6ccd1d2f45544af47e328ed4 (patch) | |
| tree | 40c4657a73d9a52f5f2784cff9a3dcb1833467ce /openecomp-be/dist | |
| parent | c175a0de2f05d37c1c774684318a525eb96bb59b (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 'openecomp-be/dist')
4 files changed, 10 insertions, 2 deletions
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/truststore b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/truststore Binary files differnew file mode 100644 index 0000000000..c4083931dc --- /dev/null +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/files/default/truststore diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_2_locate_keystore.rb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_2_locate_keystore.rb index e838543e7d..25f5d4ff65 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_2_locate_keystore.rb +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_2_locate_keystore.rb @@ -12,3 +12,11 @@ cookbook_file "#{ENV['JETTY_BASE']}/etc/keystore" do group "jetty" mode 0755 end + +cookbook_file "#{ENV['JETTY_BASE']}/etc/truststore" do + source "truststore" + owner "jetty" + group "jetty" + mode 0755 +end + 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 90e0802a94..62fe1265b7 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 @@ -8,7 +8,7 @@ template "onboard-be-config" do :onboard_ip => node['ONBOARDING_BE_VIP'], :onboard_port => node['ONBOARDING_BE'][:http_port], :ssl_port => node['ONBOARDING_BE'][:https_port], - :cassandra_ip => node['Nodes']['CS'], + :cassandra_ip => node['Nodes']['CS'].join(",").gsub(/[|]/,''), :DC_NAME => node['cassandra'][:cluster_name]+node.chef_environment, :socket_connect_timeout => node['cassandra']['socket_connect_timeout'], :socket_read_timeout => node['cassandra']['socket_read_timeout'], diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml index 027ea019eb..5de979f96e 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml +++ b/openecomp-be/dist/sdc-onboard-backend-docker/pom.xml @@ -37,7 +37,7 @@ <resources> <resource> <directory> - ${project.parent.basedir}/../../openecomp-be/tools/swagger-ui/api-docs + ${project.parent.basedir}/../../openecomp-be/tools/swagger-ui/target/api-docs </directory> <includes> <include>api-docs.war</include> |