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>

diff --git a/deliveries/Apps_Users_OnBoarding_Script.sql b/deliveries/Apps_Users_OnBoarding_Script.sql
index 5c358ca..98dac6a 100644 (file)
--- 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 d80b6a0..0c280a9 100644 (file)
--- 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
similarity index 100%
rename from deliveries/properties_rackspace/ECOMPDBCAPP/dbcapp.properties
rename to deliveries/properties_simpledemo/ECOMPDBCAPP/dbcapp.properties

diff --git a/deliveries/properties_rackspace/ECOMPDBCAPP/fusion.properties b/deliveries/properties_simpledemo/ECOMPDBCAPP/fusion.properties
similarity index 100%
rename from deliveries/properties_rackspace/ECOMPDBCAPP/fusion.properties
rename to deliveries/properties_simpledemo/ECOMPDBCAPP/fusion.properties

diff --git a/deliveries/properties_rackspace/ECOMPDBCAPP/portal.properties b/deliveries/properties_simpledemo/ECOMPDBCAPP/portal.properties
similarity index 100%
rename from deliveries/properties_rackspace/ECOMPDBCAPP/portal.properties
rename to deliveries/properties_simpledemo/ECOMPDBCAPP/portal.properties

diff --git a/deliveries/properties_rackspace/ECOMPDBCAPP/system.properties b/deliveries/properties_simpledemo/ECOMPDBCAPP/system.properties
similarity index 95%
rename from deliveries/properties_rackspace/ECOMPDBCAPP/system.properties
rename to deliveries/properties_simpledemo/ECOMPDBCAPP/system.properties
index 019268b..5ba96b1 100644 (file)
--- 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
similarity index 100%
rename from deliveries/properties_rackspace/ECOMPPORTALAPP/fusion.properties
rename to deliveries/properties_simpledemo/ECOMPPORTALAPP/fusion.properties

diff --git a/deliveries/properties_rackspace/ECOMPPORTALAPP/logback.xml b/deliveries/properties_simpledemo/ECOMPPORTALAPP/logback.xml
similarity index 100%
rename from deliveries/properties_rackspace/ECOMPPORTALAPP/logback.xml
rename to deliveries/properties_simpledemo/ECOMPPORTALAPP/logback.xml

diff --git a/deliveries/properties_rackspace/ECOMPPORTALAPP/openid-connect.properties b/deliveries/properties_simpledemo/ECOMPPORTALAPP/openid-connect.properties
similarity index 100%
rename from deliveries/properties_rackspace/ECOMPPORTALAPP/openid-connect.properties
rename to deliveries/properties_simpledemo/ECOMPPORTALAPP/openid-connect.properties

diff --git a/deliveries/properties_rackspace/ECOMPPORTALAPP/portal.properties b/deliveries/properties_simpledemo/ECOMPPORTALAPP/portal.properties
similarity index 100%
rename from deliveries/properties_rackspace/ECOMPPORTALAPP/portal.properties
rename to deliveries/properties_simpledemo/ECOMPPORTALAPP/portal.properties

diff --git a/deliveries/properties_rackspace/ECOMPPORTALAPP/system.properties b/deliveries/properties_simpledemo/ECOMPPORTALAPP/system.properties
similarity index 100%
rename from deliveries/properties_rackspace/ECOMPPORTALAPP/system.properties
rename to deliveries/properties_simpledemo/ECOMPPORTALAPP/system.properties

diff --git a/deliveries/properties_rackspace/ECOMPSDKAPP/fusion.properties b/deliveries/properties_simpledemo/ECOMPSDKAPP/fusion.properties
similarity index 100%
rename from deliveries/properties_rackspace/ECOMPSDKAPP/fusion.properties
rename to deliveries/properties_simpledemo/ECOMPSDKAPP/fusion.properties

diff --git a/deliveries/properties_rackspace/ECOMPSDKAPP/portal.properties b/deliveries/properties_simpledemo/ECOMPSDKAPP/portal.properties
similarity index 100%
rename from deliveries/properties_rackspace/ECOMPSDKAPP/portal.properties
rename to deliveries/properties_simpledemo/ECOMPSDKAPP/portal.properties

diff --git a/deliveries/properties_rackspace/ECOMPSDKAPP/system.properties b/deliveries/properties_simpledemo/ECOMPSDKAPP/system.properties
similarity index 100%
rename from deliveries/properties_rackspace/ECOMPSDKAPP/system.properties
rename to deliveries/properties_simpledemo/ECOMPSDKAPP/system.properties

diff --git a/deliveries/properties_rackspace/ECOMPWIDGETMS/application.properties b/deliveries/properties_simpledemo/ECOMPWIDGETMS/application.properties
similarity index 100%
rename from deliveries/properties_rackspace/ECOMPWIDGETMS/application.properties
rename to deliveries/properties_simpledemo/ECOMPWIDGETMS/application.properties