summaryrefslogtreecommitdiffstats
path: root/deliveries
diff options
context:
space:
mode:
authorChristopher Lott (cl778h) <clott@research.att.com>2017-10-11 11:42:04 -0400
committerChristopher Lott (cl778h) <clott@research.att.com>2017-10-11 13:29:25 -0400
commitec4eb9c7b9bed3bd5cc01ea127632d637b738cbc (patch)
treeb93a057dd86eb68fde57ab8e892e0258ef320e05 /deliveries
parent6a4a349a1be3ad5460e507dc4e2098936fd23859 (diff)
Increase DB timeout; rename props dir
1. Revise docker compose: a) Use version 2.1, up from 2.0 b) Increase apps database startup timeout from 3 to 5 minutes 2. Rename the properties directory to drop the env-specific name "rackspace" 3. Use MariaDB JDBC connection URL for DBC app. 4. Show AAI-UI and CLI apps by default on application home screen Issue: PORTAL-20, PORTAL-95, PORTAL-117 Change-Id: I3a96d2e3142a7c2229f5b67525d79fa5e602084b Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
Diffstat (limited to 'deliveries')
-rw-r--r--deliveries/Apps_Users_OnBoarding_Script.sql4
-rw-r--r--deliveries/docker-compose.yml6
-rw-r--r--deliveries/properties_simpledemo/ECOMPDBCAPP/dbcapp.properties (renamed from deliveries/properties_rackspace/ECOMPDBCAPP/dbcapp.properties)0
-rw-r--r--deliveries/properties_simpledemo/ECOMPDBCAPP/fusion.properties (renamed from deliveries/properties_rackspace/ECOMPDBCAPP/fusion.properties)0
-rw-r--r--deliveries/properties_simpledemo/ECOMPDBCAPP/portal.properties (renamed from deliveries/properties_rackspace/ECOMPDBCAPP/portal.properties)0
-rw-r--r--deliveries/properties_simpledemo/ECOMPDBCAPP/system.properties (renamed from deliveries/properties_rackspace/ECOMPDBCAPP/system.properties)4
-rw-r--r--deliveries/properties_simpledemo/ECOMPPORTALAPP/fusion.properties (renamed from deliveries/properties_rackspace/ECOMPPORTALAPP/fusion.properties)0
-rw-r--r--deliveries/properties_simpledemo/ECOMPPORTALAPP/logback.xml (renamed from deliveries/properties_rackspace/ECOMPPORTALAPP/logback.xml)0
-rw-r--r--deliveries/properties_simpledemo/ECOMPPORTALAPP/openid-connect.properties (renamed from deliveries/properties_rackspace/ECOMPPORTALAPP/openid-connect.properties)0
-rw-r--r--deliveries/properties_simpledemo/ECOMPPORTALAPP/portal.properties (renamed from deliveries/properties_rackspace/ECOMPPORTALAPP/portal.properties)0
-rw-r--r--deliveries/properties_simpledemo/ECOMPPORTALAPP/system.properties (renamed from deliveries/properties_rackspace/ECOMPPORTALAPP/system.properties)0
-rw-r--r--deliveries/properties_simpledemo/ECOMPSDKAPP/fusion.properties (renamed from deliveries/properties_rackspace/ECOMPSDKAPP/fusion.properties)0
-rw-r--r--deliveries/properties_simpledemo/ECOMPSDKAPP/portal.properties (renamed from deliveries/properties_rackspace/ECOMPSDKAPP/portal.properties)0
-rw-r--r--deliveries/properties_simpledemo/ECOMPSDKAPP/system.properties (renamed from deliveries/properties_rackspace/ECOMPSDKAPP/system.properties)0
-rw-r--r--deliveries/properties_simpledemo/ECOMPWIDGETMS/application.properties (renamed from deliveries/properties_rackspace/ECOMPWIDGETMS/application.properties)0
15 files changed, 9 insertions, 5 deletions
diff --git a/deliveries/Apps_Users_OnBoarding_Script.sql b/deliveries/Apps_Users_OnBoarding_Script.sql
index 5c358ca2..98dac6a3 100644
--- a/deliveries/Apps_Users_OnBoarding_Script.sql
+++ b/deliveries/Apps_Users_OnBoarding_Script.sql
@@ -370,4 +370,8 @@ UPDATE `fn_app` SET `thumbnail` = 0x89504E470D0A1A0A0000000D49484452000000D400
-- for R1 Enhanced Notification ticket source from JIRA
INSERT INTO `ep_basic_auth_account` VALUES (1,'JIRA','jira','6APqvG4AU2rfLgCvMdySwQ==','Y');
+-- for setting up CLI and AAI-UI to be visible on Home page for demo account
+INSERT INTO `fn_pers_user_app_sel` VALUES (1,1,7,'S');
+INSERT INTO `fn_pers_user_app_sel` VALUES (2,1,8,'S');
+
commit;
diff --git a/deliveries/docker-compose.yml b/deliveries/docker-compose.yml
index d80b6a03..0c280a93 100644
--- a/deliveries/docker-compose.yml
+++ b/deliveries/docker-compose.yml
@@ -5,7 +5,7 @@
# Images must be pulled from ONAP Nexus registry after logging in like this:
# docker login -u USER -p PASS nexus3.onap.org:10001
-version: '2.0'
+version: '2.1'
services:
@@ -47,7 +47,7 @@ services:
command:
- /wait-for.sh
- -t
- - "180"
+ - "300"
- portal-db:3306
- --
- /start-wms-cmd.sh
@@ -87,7 +87,7 @@ services:
command:
- /wait-for.sh
- -t
- - "180"
+ - "300"
- portal-db:3306
- --
- /start-apps-cmd.sh
diff --git a/deliveries/properties_rackspace/ECOMPDBCAPP/dbcapp.properties b/deliveries/properties_simpledemo/ECOMPDBCAPP/dbcapp.properties
index 1c13384d..1c13384d 100644
--- a/deliveries/properties_rackspace/ECOMPDBCAPP/dbcapp.properties
+++ b/deliveries/properties_simpledemo/ECOMPDBCAPP/dbcapp.properties
diff --git a/deliveries/properties_rackspace/ECOMPDBCAPP/fusion.properties b/deliveries/properties_simpledemo/ECOMPDBCAPP/fusion.properties
index 4d4e17e9..4d4e17e9 100644
--- a/deliveries/properties_rackspace/ECOMPDBCAPP/fusion.properties
+++ b/deliveries/properties_simpledemo/ECOMPDBCAPP/fusion.properties
diff --git a/deliveries/properties_rackspace/ECOMPDBCAPP/portal.properties b/deliveries/properties_simpledemo/ECOMPDBCAPP/portal.properties
index cec3bb3c..cec3bb3c 100644
--- a/deliveries/properties_rackspace/ECOMPDBCAPP/portal.properties
+++ b/deliveries/properties_simpledemo/ECOMPDBCAPP/portal.properties
diff --git a/deliveries/properties_rackspace/ECOMPDBCAPP/system.properties b/deliveries/properties_simpledemo/ECOMPDBCAPP/system.properties
index 019268b7..5ba96b13 100644
--- a/deliveries/properties_rackspace/ECOMPDBCAPP/system.properties
+++ b/deliveries/properties_simpledemo/ECOMPDBCAPP/system.properties
@@ -1,8 +1,8 @@
#Local
app_display_name = DMaaP Bus Ctlr
-db.driver = com.mysql.jdbc.Driver
-db.connectionURL = jdbc:mysql://portal-db:3306/dbca_os
+db.driver = org.mariadb.jdbc.Driver
+db.connectionURL = jdbc:mariadb://portal-db:3306/dbca_os
db.userName = root
db.password = Aa123456
db.encrypt_flag = false
diff --git a/deliveries/properties_rackspace/ECOMPPORTALAPP/fusion.properties b/deliveries/properties_simpledemo/ECOMPPORTALAPP/fusion.properties
index c92a5739..c92a5739 100644
--- a/deliveries/properties_rackspace/ECOMPPORTALAPP/fusion.properties
+++ b/deliveries/properties_simpledemo/ECOMPPORTALAPP/fusion.properties
diff --git a/deliveries/properties_rackspace/ECOMPPORTALAPP/logback.xml b/deliveries/properties_simpledemo/ECOMPPORTALAPP/logback.xml
index 8afa5af9..8afa5af9 100644
--- a/deliveries/properties_rackspace/ECOMPPORTALAPP/logback.xml
+++ b/deliveries/properties_simpledemo/ECOMPPORTALAPP/logback.xml
diff --git a/deliveries/properties_rackspace/ECOMPPORTALAPP/openid-connect.properties b/deliveries/properties_simpledemo/ECOMPPORTALAPP/openid-connect.properties
index 33c919b2..33c919b2 100644
--- a/deliveries/properties_rackspace/ECOMPPORTALAPP/openid-connect.properties
+++ b/deliveries/properties_simpledemo/ECOMPPORTALAPP/openid-connect.properties
diff --git a/deliveries/properties_rackspace/ECOMPPORTALAPP/portal.properties b/deliveries/properties_simpledemo/ECOMPPORTALAPP/portal.properties
index 2ec8bb48..2ec8bb48 100644
--- a/deliveries/properties_rackspace/ECOMPPORTALAPP/portal.properties
+++ b/deliveries/properties_simpledemo/ECOMPPORTALAPP/portal.properties
diff --git a/deliveries/properties_rackspace/ECOMPPORTALAPP/system.properties b/deliveries/properties_simpledemo/ECOMPPORTALAPP/system.properties
index 5306c2ab..5306c2ab 100644
--- a/deliveries/properties_rackspace/ECOMPPORTALAPP/system.properties
+++ b/deliveries/properties_simpledemo/ECOMPPORTALAPP/system.properties
diff --git a/deliveries/properties_rackspace/ECOMPSDKAPP/fusion.properties b/deliveries/properties_simpledemo/ECOMPSDKAPP/fusion.properties
index 8ce8cc95..8ce8cc95 100644
--- a/deliveries/properties_rackspace/ECOMPSDKAPP/fusion.properties
+++ b/deliveries/properties_simpledemo/ECOMPSDKAPP/fusion.properties
diff --git a/deliveries/properties_rackspace/ECOMPSDKAPP/portal.properties b/deliveries/properties_simpledemo/ECOMPSDKAPP/portal.properties
index 31809ddc..31809ddc 100644
--- a/deliveries/properties_rackspace/ECOMPSDKAPP/portal.properties
+++ b/deliveries/properties_simpledemo/ECOMPSDKAPP/portal.properties
diff --git a/deliveries/properties_rackspace/ECOMPSDKAPP/system.properties b/deliveries/properties_simpledemo/ECOMPSDKAPP/system.properties
index 105502f1..105502f1 100644
--- a/deliveries/properties_rackspace/ECOMPSDKAPP/system.properties
+++ b/deliveries/properties_simpledemo/ECOMPSDKAPP/system.properties
diff --git a/deliveries/properties_rackspace/ECOMPWIDGETMS/application.properties b/deliveries/properties_simpledemo/ECOMPWIDGETMS/application.properties
index 7c95923f..7c95923f 100644
--- a/deliveries/properties_rackspace/ECOMPWIDGETMS/application.properties
+++ b/deliveries/properties_simpledemo/ECOMPWIDGETMS/application.properties