summaryrefslogtreecommitdiffstats
path: root/openecomp-be/dist/sdc-onboard-backend-docker
diff options
context:
space:
mode:
authoravigaffa <avi.gaffa@amdocs.com>2018-11-18 16:01:07 +0200
committerOren Kleks <orenkle@amdocs.com>2018-11-26 19:45:30 +0000
commitd8906a0cc7fcc302020e983fdfade2758663ba4d (patch)
tree6082ed5edc4634945785342285ad754ca8d135a9 /openecomp-be/dist/sdc-onboard-backend-docker
parent4d34afb67ad28e83e07cdd365c985b6fb8745ebe (diff)
error when trying to archive\restore
fix bug: getting server error when trying to archive\restore VLM\VSP Change-Id: I7abefd2d8ac368d590329071a56f200c203cf966 Issue-ID: SDC-1667 Signed-off-by: avigaffa <avi.gaffa@amdocs.com>
Diffstat (limited to 'openecomp-be/dist/sdc-onboard-backend-docker')
-rw-r--r--openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_5_setup_configuration.rb26
-rw-r--r--openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/configuration.yaml.erb13
2 files changed, 28 insertions, 11 deletions
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 b729ae777c..a8158c9313 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
@@ -5,17 +5,21 @@ template "onboard-be-config" do
group "jetty"
mode "0755"
variables({
- :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'].join(",").gsub(/[|]/,''),
- :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],
- :cassandra_usr => node['cassandra'][:cassandra_user],
- :cassandra_truststore_password => node['cassandra'][:truststore_password],
- :cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}"
+ :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'].join(",").gsub(/[|]/,''),
+ :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],
+ :cassandra_usr => node['cassandra'][:cassandra_user],
+ :cassandra_truststore_password => node['cassandra'][:truststore_password],
+ :cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}",
+ :catalog_notification_url => node['ONBOARDING_BE']['catalog_notification_url'],
+ :catalog_be_http_port => node['BE'][:http_port],
+ :catalog_be_ssl_port => node['BE'][:https_port],
+ :catalog_be_fqdn => node['Nodes']['BE']
})
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 a2f0bbd3bf..c0f3e1b043 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
@@ -1,3 +1,16 @@
+catalogNotificationsConfig:
+ # catalog backend protocol
+ <% if node[:disableHttp] -%>
+ catalogBeProtocol: https
+ <% else %>
+ catalogBeProtocol: http
+ <% end -%>
+ catalogBeHttpPort: <%= @catalog_be_http_port %>
+ catalogBeSslPort: <%= @catalog_be_ssl_port %>
+ catalogBeFqdn: <%= @catalog_be_fqdn %>
+ # do not remove the "" from catalog_notification_url. it is escaping % characters coming from AUTO.json
+ catalogNotificationUrl: "<%= @catalog_notification_url %>"
+
notifications:
pollingIntervalMsec: 2000
selectionSize: 100