From d8bdab062d106a854ae7719433baeaa3954c88b6 Mon Sep 17 00:00:00 2001 From: Tal Gitelman Date: Thu, 29 Nov 2018 11:57:23 +0200 Subject: update sdc portal integration Issue-ID: SDC-1749 Change-Id: Ie306076357cb572402ac80b4be9eb9c5cfa960dd Signed-off-by: Tal Gitelman --- .../chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb | 3 ++- .../sdc-catalog-be/recipes/BE_6_setup_portal_and_key_properties.rb | 3 ++- .../sdc-catalog-be/templates/default/BE-portal.properties.erb | 5 ++++- 3 files changed, 8 insertions(+), 3 deletions(-) (limited to 'catalog-be/sdc-backend') diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb index d1d6f642fd..54f7128aa2 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/attributes/default.rb @@ -40,4 +40,5 @@ default['DMAAP']['active'] = false #Portal default['ECompP']['cipher_key'] = "AGLDdG4D04BKm2IxIWEr8o==" default['ECompP']['portal_user'] = "Ipwxi2oLvDxctMA1royaRw1W0jhucLx+grHzci3ePIA=" -default['ECompP']['portal_pass'] = "j85yNhyIs7zKYbR1VlwEfNhS6b7Om4l0Gx5O8931sCI=" \ No newline at end of file +default['ECompP']['portal_pass'] = "j85yNhyIs7zKYbR1VlwEfNhS6b7Om4l0Gx5O8931sCI=" +default['ECompP']['portal_app_name'] = "Ipwxi2oLvDxctMA1royaRw1W0jhucLx+grHzci3ePIA=" \ No newline at end of file diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_and_key_properties.rb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_and_key_properties.rb index bf724ded5f..4f9993848a 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_and_key_properties.rb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/recipes/BE_6_setup_portal_and_key_properties.rb @@ -8,7 +8,8 @@ template "template portal.properties" do :ecomp_rest_url => node['ECompP']['ecomp_rest_url'], :ecomp_redirect_url => node['ECompP']['ecomp_redirect_url'], :ecomp_portal_user => node['ECompP']['portal_user'], - :ecomp_portal_pass => node['ECompP']['portal_pass'] + :ecomp_portal_pass => node['ECompP']['portal_pass'], + :portal_app_name => node['ECompP']['portal_app_name'], }) end diff --git a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb index bf58f77d9f..d43c2faa1a 100644 --- a/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb +++ b/catalog-be/sdc-backend/chef-repo/cookbooks/sdc-catalog-be/templates/default/BE-portal.properties.erb @@ -54,14 +54,17 @@ use_rest_for_functional_menu=true ########################################################################## # Name of java class that implements the OnBoardingApiService interface. -portal.api.impl.class = org.openecomp.sdc.be.ecomp.EcompIntImpl +portal.api.impl.class = org.openecomp.sdc.be.ecomp.PortalRestAPICentralServiceImpl +role_access_centralized = remote # URL of the Portal where this app is onboarded ecomp_redirect_url = <%= @ecomp_redirect_url %> # URL of the ECOMP Portal REST API ecomp_rest_url = <%= @ecomp_rest_url %> + #Portal user & key portal_user = <%= @ecomp_portal_user %> portal_pass = <%= @ecomp_portal_pass %> +portal_app_name = <%= @portal_app_name %> -- cgit 1.2.3-korg