| commit | 3453264c35275af52a2fdcde33f6e8347a65d15b | [log] [tgz] |
|---|---|---|
| author | marine <marine.de.dorlodot@intl.att.com> | Fri Jun 18 17:51:46 2021 +0200 |
| committer | Michael Morris <michael.morris@est.tech> | Mon Jul 05 08:45:12 2021 +0000 |
| tree | c33f49b95ac80b2240df631f0a354bc221d15030 | |
| parent | 14a9a365c5aaaa4a34fe23541dc455134056cbdb [diff] |
External license as "toggleable feature" Code modification in onboarding BE and onboarding UI so that the External License can be seen as a toggleable feature. By default this will set to true but could be disabled. Issue-ID: SDC-3618 Signed-off-by: sebdet <sebastien.determe@intl.att.com> Change-Id: I01690c4cb44d3df590987bb340e8fbb58fe960e0 Signed-off-by: marine <marine.de.dorlodot@intl.att.com>
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 cb8d392..1cd2ed2 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
@@ -70,3 +70,11 @@ :EP2_CONFIG => node['EXTTEST']['ep2_config'] }) end + +template "FeaturesProperties" do + path "#{ENV['JETTY_BASE']}/config/onboarding-be/features.properties" + source "features.properties.erb" + owner "#{ENV['JETTY_USER']}" + group "#{ENV['JETTY_GROUP']}" + mode "0755" +end
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/features.properties.erb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/features.properties.erb new file mode 100644 index 0000000..1f87ee2 --- /dev/null +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/features.properties.erb
@@ -0,0 +1 @@ +EXTERNAL_LICENSE=true \ No newline at end of file
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh index 7381d50..dc68d6f 100644 --- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh +++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh
@@ -6,6 +6,7 @@ -Dlog.home=$JETTY_BASE/logs \ -Dlogback.configurationFile=$JETTY_BASE/config/onboarding-be/logback.xml \ -Dconfiguration.yaml=$JETTY_BASE/config/onboarding-be/onboarding_configuration.yaml \ + -Dfeatures.properties=$JETTY_BASE/config/onboarding-be/features.properties \ -Dconfig.location=$JETTY_BASE/config/onboarding-be/." cd $JETTY_BASE