aboutsummaryrefslogtreecommitdiffstats
path: root/openecomp-be
diff options
context:
space:
mode:
authormarine <marine.de.dorlodot@intl.att.com>2021-06-18 17:51:46 +0200
committerMichael Morris <michael.morris@est.tech>2021-07-05 08:45:12 +0000
commit3453264c35275af52a2fdcde33f6e8347a65d15b (patch)
treec33f49b95ac80b2240df631f0a354bc221d15030 /openecomp-be
parent14a9a365c5aaaa4a34fe23541dc455134056cbdb (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>
Diffstat (limited to 'openecomp-be')
-rw-r--r--openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/recipes/ON_5_setup_configuration.rb8
-rw-r--r--openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/features.properties.erb1
-rw-r--r--openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh1
3 files changed, 10 insertions, 0 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 cb8d392741..1cd2ed284f 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 @@ template "ExternalTestingConfiguration" do
: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 0000000000..1f87ee24d4
--- /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 7381d50dfe..dc68d6f3a5 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 @@ JAVA_OPTIONS="$JAVA_OPTIONS \
-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