Removing DBO from templates, refactoring og readme

mipopescu · Mar 11, 2019 · 41601f2 · 41601f2
1 parent 91f6d08
commit 41601f2
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 45 deletions.
diff --git a/environments/mysql/env.properties b/environments/mysql/env.properties
@@ -23,11 +23,16 @@ db.type=mysql
 db.TYPE=MYSQL
 db.username=webm
 db.password=webm
-db.name=webm 
+db.name=webm
+db.admin.url="jdbc:mysql://mysql:3306" 
 db.url="jdbc:mysql://mysql:3306/webm"
 db.admin.password=root
 db.admin.username=root
-
+db.fixes=[]
+is.db.fixes=[]
+mws.db.fixes=[]
+obe.db.fixes=[]
+pre.db.fixes=[]
 um.fixes=[]
 um.url=nsp://localhost:9000
 tc.fixes=[]

diff --git a/templates/sag-db-mysql-104-sample/docker-compose.yml b/templates/sag-db-mysql-104-sample/docker-compose.yml
@@ -31,11 +31,11 @@ services:
       - ./mysql.cnf:/etc/mysql/conf.d/mysql.cnf
       - mysql_data:/var/lib/mysql
     #no need to create user and db upfront; will be created via the storage section of the template  
-    #environment:
-      #- MYSQL_ROOT_PASSWORD=root
-      #- MYSQL_DATABASE=webm
-      #- MYSQL_USER=webm
-      #- MYSQL_PASSWORD=webm
+    environment:
+      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_DATABASE=webm
+      - MYSQL_USER=webm
+      - MYSQL_PASSWORD=webm
 
   # provisioner for webm db schemas using template.yaml
   provision:

diff --git a/templates/sag-db-mysql-104-sample/template.yaml b/templates/sag-db-mysql-104-sample/template.yaml
@@ -35,7 +35,6 @@ environments:
     db.password:         ${db.name}         # webM database password
     db.components:
       - ProcessEngine
-      - DynamicBusinessOrchestrator
       - OperationManagement
       - ISInternal
       - ISCoreAudit
@@ -49,32 +48,30 @@ environments:
     is.db.fixes:         ALL                 # IS database scripts fixes to install
     mws.db.fixes:        ALL                 # MWS database scripts fixes to install
     obe.db.fixes:        ALL                 # OBE database scripts fixes to install
-    dbo.db.fixes:        ALL                 # DBO database scripts fixes to install
     pre.db.fixes:        ALL                 # PRE database scripts fixes to install    
     db.templates:
       - dbc
       - is-db-scripts
       - mws-db-scripts
       - optimize-db-scripts
-      - dbo-db-scripts
       - pre-db-scripts      
 layers:
   db:
     productRepo: ${repo.product}            # install products from
     fixRepo:     ${repo.fix}                # install fixes from
     templates:   ${db.templates}
     databases:
-      storage:
-        components:  
-          - STR
-        version:     latest
-        db.type:     ${db.type}
-        db.url:      ${db.admin.url}
-        db.admin.username: ${db.admin.username}
-        db.admin.password: ${db.admin.password}
-        db.username: ${db.username}
-        db.password: ${db.password}
-        db.name:     ${db.name}
+      #storage:
+      #  components:  
+      #    - STR
+      #  version:     latest
+      #  db.type:     ${db.type}
+      #  db.url:      ${db.admin.url}
+      #  db.admin.username: ${db.admin.username}
+      #  db.admin.password: ${db.admin.password}
+      #  db.username: ${db.username}
+      #  db.password: ${db.password}
+      #  db.name:     ${db.name}
       schemas:
         products:    ${db.products}
         components:  ${db.components}
@@ -104,11 +101,7 @@ templates:
   optimize-db-scripts:
     products:
       OBEcdc:
-    fixes: ${obe.db.fixes}      
-  dbo-db-scripts:
-    products:
-      DBOcdc:
-    fixes: ${dbo.db.fixes}      
+    fixes: ${obe.db.fixes}           
   pre-db-scripts:
     products:
       WPEcdc:

diff --git a/templates/sag-db-oracle-104-sample/README.md b/templates/sag-db-oracle-104-sample/README.md
@@ -36,7 +36,7 @@ None.
 ### Supported platforms
 
 * All supported Windows and UNIX platforms
-* All supported versions of Oracle database
+* All supported versions of Oracle database   
 * Docker Engine 17.09 and higher
 
 ## Running as a standalone Composite Template
@@ -85,19 +85,25 @@ Successful output looks like this:
 * Therefore all database components will not show the same release number.       *
 *                                                                                *
 * code  version    name                           data                           *
+* CTR   10.4       ComponentTracker               WEBMDATA,WEBMINDX              *
 * ISC   10.3       ISCoreAudit                    WEBMDATA,WEBMINDX              *
 * ISI   10.3.fix1  ISInternal                     WEBMDATA,WEBMINDX              *
 * DSL   7.1        DistributedLocking             WEBMDATA,WEBMINDX              *
 * IDR   7.1        DocumentHistory                WEBMDATA,WEBMINDX              *
 * XRF   8.2.2      CrossReference                 WEBMDATA,WEBMINDX              *
+* MWS   10.4       MywebMethodsServer             WEBMDATA,WEBMINDX              *
 * CCS   9.0.1      CentralConfiguration           WEBMDATA,WEBMINDX              *
-* MWS   10.2       MywebMethodsServer             WEBMDATA,WEBMINDX              *
-* CTR   8.0        ComponentTracker               WEBMDATA,WEBMINDX              *
+* OPM   9.0.1      OperationManagement            WEBMDATA,WEBMINDX              *
+* OPT_AE_ANL 85         Optimize Analytic Engine Analysis Component null,null                      *
+* ANL   10.1       Analysis                       WEBMDATA,WEBMINDX              *
+* DBM   9.9        DatabaseManagement             WEBMDATA,WEBMINDX              *
+* DTP   9.0.1      DataPurge                      WEBMDATA,WEBMINDX              *
 * PRA   10.3       ProcessAudit                   WEBMDATA,WEBMINDX              *
+* OPT_AE_PTR 50         Optimize Analytic Engine Process Tracker Component null,null                      *
+* PTR   10.1       ProcessTracker                 WEBMDATA,WEBMINDX              *
 * PRE   10.4       ProcessEngine                  WEBMDATA,WEBMINDX              *
+The expected values were successfully retrieved after 1 call within 6 seconds.
 
-
-The expected values were successfully retrieved after 1 call within 5 seconds.
 TEST SUCCESSFUL
 ```
 

diff --git a/templates/sag-db-oracle-104-sample/template.yaml b/templates/sag-db-oracle-104-sample/template.yaml
@@ -47,14 +47,12 @@ environments:
     is.db.fixes:         ALL                 # IS database scripts fixes to install
     mws.db.fixes:        ALL                 # MWS database scripts fixes to install
     obe.db.fixes:        ALL                 # OBE database scripts fixes to install
-    dbo.db.fixes:        ALL                 # DBO database scripts fixes to install
     pre.db.fixes:        ALL                 # PRE database scripts fixes to install    
     db.templates:
       - dbc
       - is-db-scripts
       - mws-db-scripts
       - optimize-db-scripts
-      - dbo-db-scripts
       - pre-db-scripts      
 layers:
   db:
@@ -102,11 +100,7 @@ templates:
   optimize-db-scripts:
     products:
       OBEcdc:
-    fixes: ${obe.db.fixes}      
-  dbo-db-scripts:
-    products:
-      DBOcdc:
-    fixes: ${dbo.db.fixes}      
+    fixes: ${obe.db.fixes}           
   pre-db-scripts:
     products:
       WPEcdc:

diff --git a/templates/sag-db-sqlserver-104-sample/template.yaml b/templates/sag-db-sqlserver-104-sample/template.yaml
@@ -42,14 +42,12 @@ environments:
     is.db.fixes:         ALL                 # IS database scripts fixes to install
     mws.db.fixes:        ALL                 # MWS database scripts fixes to install
     obe.db.fixes:        ALL                 # OBE database scripts fixes to install
-    dbo.db.fixes:        ALL                 # DBO database scripts fixes to install
     pre.db.fixes:        ALL                 # PRE database scripts fixes to install
     db.templates:
       - dbc
       - is-db-scripts
       - mws-db-scripts
       - optimize-db-scripts
-      - dbo-db-scripts
       - pre-db-scripts   
 
 layers:
@@ -93,11 +91,7 @@ templates:
   optimize-db-scripts:
     products:
       OBEcdc:
-    fixes: ${obe.db.fixes}      
-  dbo-db-scripts:
-    products:
-      DBOcdc:
-    fixes: ${dbo.db.fixes}      
+    fixes: ${obe.db.fixes}            
   pre-db-scripts:
     products:
       WPEcdc: