From f6c222cd642ea9e3fab7a502ad74ca955cb4b2b4 Mon Sep 17 00:00:00 2001 From: "Kotagiri, Ramprasad (rp5662)" Date: Thu, 28 Mar 2019 16:44:25 -0400 Subject: Docker container implementation This change contains following items: 1) Update b2b-library.js to remove non-compliant code 2) Format source code for ccsdk-app-os module 3) Add Dockerfile and artifacts to create docker container 4) Update POM files for docker maven plugin and version changes Issue-ID: CCSDK-1011 Change-Id: Iae93b32e1d8c2e7b911b044bc07bba6b720742a5 Signed-off-by: ramprasad kotagiri --- .../main/webapp/WEB-INF/conf/dashboard.properties | 34 +++++++++++++--------- .../webapp/WEB-INF/conf/system.properties.template | 2 +- 2 files changed, 21 insertions(+), 15 deletions(-) (limited to 'ccsdk-app-os/src/main/webapp/WEB-INF/conf') diff --git a/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties index 735afe6..2496647 100644 --- a/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties +++ b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/dashboard.properties @@ -1,18 +1,24 @@ -# ONAP dashboard.properties +# ATT dashboard.properties -# Properties for the OOM Dashboard webapp +# Properties for the ONAP Controller Dashboard webapp -# Controllers - one KEY for each set of properties "KEY.property" below. -controller.key.list = dev, qa +# Set to true to use local copies of controller data +controller.mock.data = false -dev.name = Development host -dev.url = http://127.0.0.1:8080 -dev.username = user -dev.password = pass -dev.is_encrypted = false +# for ONAP or other type +controller.type = os + +controller.env = dev + +# YAML would represent this more elegantly, but Spring likes properties. +controller.key.list = dev -qa.name = QA host -qa.url = http://1.2.3.4:8080 -qa.username = user -qa.password = pass -qa.is_encrypted = false +dev.name = Local +dev.url = https://orcl.com/api/v3.1 +dev.inventory.url = https://inventory.com:30123/ +dev.dhandler.url = https://dplh.com:30125/ +dev.consul.url = http://consul.com:8500/ + +dev.username = admin +dev.password = admin +dev.is_encrypted = false diff --git a/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template index a4e0d5d..4d66dba 100644 --- a/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template +++ b/ccsdk-app-os/src/main/webapp/WEB-INF/conf/system.properties.template @@ -21,7 +21,7 @@ ############################################################################### # OS system.properties -app_display_name = OOM Dashboard +app_display_name = ONAP Operations UI # Postgres db.driver=org.postgresql.Driver -- cgit 1.2.3-korg