summaryrefslogtreecommitdiffstats
path: root/openecomp-be/dist/sdc-onboard-backend-docker
diff options
context:
space:
mode:
authorMurali-P <murali.p@huawei.com>2018-03-29 17:46:39 +0530
committerVitaly Emporopulo <Vitaliy.Emporopulo@amdocs.com>2018-04-30 13:51:11 +0000
commit72d62fb1aaaaeaed462083e232f3571b3bde6b08 (patch)
tree0691b2378b76270b7b7dbd8e32aff2afe895042f /openecomp-be/dist/sdc-onboard-backend-docker
parentdb69b87869091b774d6d87f3b6a9155d34d26b12 (diff)
Integrate VNF Repository in Beijing release
Migrate the code Change-Id: Ifccacf83634af32b034fd9c413e68f894f06d2f7 Issue-ID: VNFSDK-155 Signed-off-by: Murali-P <murali.p@huawei.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.rb14
-rw-r--r--openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/vnfrepo-configuration.yaml.erb4
-rw-r--r--openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh3
3 files changed, 20 insertions, 1 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 62fe1265b7..747c735b84 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
@@ -17,4 +17,18 @@ template "onboard-be-config" do
:cassandra_truststore_password => node['cassandra'][:truststore_password],
:cassandra_ssl_enabled => "#{ENV['cassandra_ssl_enabled']}"
})
+end
+
+
+
+template "VnfrepoConfiguration" do
+ path "#{ENV['JETTY_BASE']}/config/onboarding-be/config-vnfrepo.yaml"
+ source "vnfrepo-configuration.yaml.erb"
+ owner "jetty"
+ group "jetty"
+ mode "0755"
+ variables({
+ :VNFREPO_IP => node['VnfRepo']['vnfRepoHost'],
+ :VNFREPO_PORT => node['VnfRepo']['vnfRepoPort']
+ })
end \ No newline at end of file
diff --git a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/vnfrepo-configuration.yaml.erb b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/vnfrepo-configuration.yaml.erb
new file mode 100644
index 0000000000..07e26629f0
--- /dev/null
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/chef-repo/cookbooks/sdc-onboard-backend/templates/default/vnfrepo-configuration.yaml.erb
@@ -0,0 +1,4 @@
+vnfRepoPort: <%= @VNFREPO_PORT %>
+vnfRepoHost: <%= @VNFREPO_IP %>
+getVnfUri: /onapapi/vnfsdk-marketplace/v1/PackageResource/csars
+downloadVnfUri: /onapapi/vnfsdk-marketplace/v1/PackageResource/csars/%s/files \ 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 1517f72202..413fdb317e 100644
--- a/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh
+++ b/openecomp-be/dist/sdc-onboard-backend-docker/artifacts/startup.sh
@@ -14,7 +14,8 @@ JAVA_OPTIONS=" ${JAVA_OPTIONS} \
-Dconfig.home=${JETTY_BASE}/config \
-Dlog.home=${JETTY_BASE}/logs \
-Dlogback.configurationFile=${JETTY_BASE}/config/onboarding-be/logback.xml \
- -Dconfiguration.yaml=${JETTY_BASE}/config/onboarding-be/onboarding_configuration.yaml"
+ -Dconfiguration.yaml=${JETTY_BASE}/config/onboarding-be/onboarding_configuration.yaml \
+ -Dconfig.location=${JETTY_BASE}/config/onboarding-be/."
cd /var/lib/jetty