summaryrefslogtreecommitdiffstats
path: root/deliveries
diff options
context:
space:
mode:
authorManoop Talasila <talasila@research.att.com>2018-06-15 20:13:49 +0000
committerGerrit Code Review <gerrit@onap.org>2018-06-15 20:13:49 +0000
commit2edaa4d6a5f7066e0c718f85a7bf7b8dabd0c59b (patch)
treeda9b74ab1e541dd0d9347a453771f77707486247 /deliveries
parent4072269d9f6b452aaff41fc02b09bfca40356dd5 (diff)
parent9a5992e308d058ba92e897c74ab7e5bebcc49b6c (diff)
Merge "Added the link to the architecture documentation"
Diffstat (limited to 'deliveries')
-rw-r--r--deliveries/Apps_Users_OnBoarding_Script.sql2
-rwxr-xr-xdeliveries/os_docker_release.sh4
-rw-r--r--deliveries/properties_simpledemo/ONAPWIDGETMS/application.properties2
3 files changed, 4 insertions, 4 deletions
diff --git a/deliveries/Apps_Users_OnBoarding_Script.sql b/deliveries/Apps_Users_OnBoarding_Script.sql
index 34dbe896..0232a1f4 100644
--- a/deliveries/Apps_Users_OnBoarding_Script.sql
+++ b/deliveries/Apps_Users_OnBoarding_Script.sql
@@ -12,7 +12,7 @@ INSERT INTO `fn_app` (`app_id`, `app_name`, `app_image_url`, `app_description`,
(5, 'Policy', 'images/cache/portal1470452815_67021.png', NULL, NULL, 'http://policy.api.simpledemo.onap.org:8443/onap/policy', NULL, 'http://policy.api.simpledemo.onap.org:8443/onap/api/v2', '', '', NULL, 'okYTaDrhzibcbGVq5mjkVQ==', 'N', 'Y', NULL, 'Default', 'ueb_key', 'ueb_secret', 'ECOMP-PORTAL-OUTBOX', 1,'N',NULL),
(6, 'Virtual Infrastructure Deployment', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://vid.api.simpledemo.onap.org:8080/vid/welcome.htm', NULL, 'http://vid.api.simpledemo.onap.org:8080/vid/api/v2', '', '', NULL, 'okYTaDrhzibcbGVq5mjkVQ==', 'N', 'Y', NULL, 'Default', '2Re7Pvdkgw5aeAUD', 'S31PrbOzGgL4hg4owgtx47Da', 'ECOMP-PORTAL-OUTBOX-90', 1,'N',NULL),
(7, 'A&AI UI', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://aai.api.simpledemo.onap.org:9517/services/aai/webapp/index.html#/viewInspect', NULL, 'http://aai.api.simpledemo.onap.org:9517/api/v2', '', '', NULL, 't1oqm6wCXrGUXUSL8mS7pQ==', 'N', 'Y', NULL, 'aaiui', 'ueb_key', 'ueb_secret', 'ECOMP-PORTAL-OUTBOX', 1,'N',NULL),
-(8, 'CLI', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://portal.api.simpledemo.onap.org:8080/', NULL, NULL, '', '', NULL, '', 'Y', 'Y', NULL, '', '', '', '', 2,'N',NULL),
+(8, 'CLI', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://portal.api.simpledemo.onap.org:8080/', NULL, NULL, '', '', NULL, '', 'Y', 'Y', NULL, '', '', '', '', 1,'N',NULL),
(9, 'MSB', 'images/cache/portal-345993588_92550.png', NULL, NULL, 'http://msb-discovery:8080/iui/microservices/default.html', NULL, NULL, '', '', NULL, '', 'Y', 'Y', NULL, '', '', '', '', 2,'N',NULL);
-- insert SDC users user id2-8
diff --git a/deliveries/os_docker_release.sh b/deliveries/os_docker_release.sh
index 2a22fef8..3ff88b2d 100755
--- a/deliveries/os_docker_release.sh
+++ b/deliveries/os_docker_release.sh
@@ -13,7 +13,7 @@ if [ -z "$PORTAL_VERSION" ]; then
fi
TIMESTAMP=$(date +%C%y%m%dT%H%M%S)
-export VERSION="${PORTAL_VERSION}-STAGING-${TIMESTAMP}"
-export LATEST="${PORTAL_VERSION}-STAGING-latest"
+export VERSION="${PORTAL_VERSION}-${TIMESTAMP}"
+export LATEST="${PORTAL_VERSION}"
exec ./os_docker_base.sh
diff --git a/deliveries/properties_simpledemo/ONAPWIDGETMS/application.properties b/deliveries/properties_simpledemo/ONAPWIDGETMS/application.properties
index 547a882c..e353ace5 100644
--- a/deliveries/properties_simpledemo/ONAPWIDGETMS/application.properties
+++ b/deliveries/properties_simpledemo/ONAPWIDGETMS/application.properties
@@ -19,7 +19,7 @@ security.user.name=widget_user
security.user.password=ENC(IjywcRnI9+nuVEh9+OFFiRWAjBT1n718)
initialization.default.widgets=true
-initialization.widgetData.url=http://portal.api.simpledemo.onap.org:8989/ONAPPORTAL/commonWidgets
+initialization.widgetData.url=http://portal-app:8080/ONAPPORTAL/commonWidgets
## Account Basic Authentication Properties
account.user.name=portal