Migration to WSO2 Identity Server 5.8.0

wso2-attic · May 24, 2019 · dd79f68 · dd79f68
1 parent 42a18de
commit dd79f68
Show file tree

Hide file tree

Showing 16 changed files with 327 additions and 187 deletions.
diff --git a/README.md b/README.md
@@ -3,7 +3,7 @@
 This repository contains the Puppet modules for WSO2 Identity Server and the profiles related to Identity Server Analytics.
 
 ## Quick Start Guide
-1. Download an updated wso2is-5.7.0.zip or wso2is-analytics-5.7.0.zip according to your preferred deployment pattern and copy it to the `<puppet_environment>/modules/common/files` directory in the **Puppetmaster**.
+1. Download an updated wso2is-5.8.0.zip or wso2is-analytics-5.8.0.zip according to your preferred deployment pattern and copy it to the `<puppet_environment>/modules/common/files` directory in the **Puppetmaster**.
 
 2. Set up the JDK distribution as follows:
 

diff --git a/modules/is/manifests/params.pp b/modules/is/manifests/params.pp
@@ -19,7 +19,7 @@
   $user = 'wso2carbon'
   $user_group = 'wso2'
   $product = 'wso2is'
-  $product_version = '5.7.0'
+  $product_version = '5.8.0'
   $service_name = 'wso2is'
   # $local_ip = $::ipaddress
 

diff --git a/modules/is_analytics_dashboard/manifests/params.pp b/modules/is_analytics_dashboard/manifests/params.pp
@@ -20,7 +20,7 @@
   $user = 'wso2carbon'
   $user_group = 'wso2'
   $product = 'wso2is-analytics'
-  $product_version = '5.7.0'
+  $product_version = '5.8.0'
   $profile = 'dashboard'
   $service_name = "${product}-${profile}"
 

diff --git a/modules/is_analytics_dashboard_master/build.sh b/modules/is_analytics_dashboard_master/build.sh
@@ -22,7 +22,7 @@
 # Build artifacts and versions
 : ${product:="wso2is-analytics"}
 : ${profile:="dashboard"}
-: ${product_version:="5.7.0"}
+: ${product_version:="5.8.0"}
 : ${products_dir:="/usr/local/wso2"}
 : ${distribution_path:=${products_dir}"/"${product}"/"${profile}"/"${product_version}}
 : ${install_path:=${distribution_path}"/"${product}"-"${product_version}}

diff --git a/modules/is_analytics_dashboard_master/manifests/params.pp b/modules/is_analytics_dashboard_master/manifests/params.pp
@@ -20,7 +20,7 @@
   $user = 'wso2carbon'
   $user_group = 'wso2'
   $product = 'wso2is-analytics'
-  $product_version = '5.7.0'
+  $product_version = '5.8.0'
   $profile = 'dashboard'
 
   # Define the template

diff --git a/...es/is_analytics_dashboard_master/templates/carbon-home/conf/dashboard/deployment.yaml.erb b/...es/is_analytics_dashboard_master/templates/carbon-home/conf/dashboard/deployment.yaml.erb
@@ -227,7 +227,7 @@ wso2.datasources:
         validationTimeout: 30000
         isAutoCommit: false
   - name: BUSINESS_RULES_DB
-    description: The datasource used for dashboard feature
+    description: The datasource used for business rules feature
     jndiConfig:
       name: jdbc/BUSINESS_RULES_DB
       useJndiReference: true
@@ -243,23 +243,6 @@ wso2.datasources:
         connectionTestQuery: SELECT 1
         validationTimeout: 30000
         isAutoCommit: false
-#  - name: SAMPLE_DB
-#    description: Sample datasource used for gadgets generation wizard
-#    jndiConfig:
-#      name: jdbc/SAMPLE_DB
-#      useJndiReference: true
-#    definition:
-#      type: RDBMS
-#      configuration:
-#        jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/SAMPLE_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE'
-#        username: wso2carbon
-#        password: wso2carbon
-#        driverClassName: org.h2.Driver
-#        maxPoolSize: 10
-#        idleTimeout: 60000
-#        connectionTestQuery: SELECT 1
-#        validationTimeout: 30000
-#        isAutoCommit: false
 
   # Dashboard data source
   - name: WSO2_STATUS_DASHBOARD_DB
@@ -315,56 +298,6 @@ wso2.datasources:
         connectionTestQuery: SELECT 1
         validationTimeout: 30000
         isAutoCommit: false
-  - name: HTTP_ANALYTICS_DB
-    description: The datasource used for HTTP Analytics dashboard
-    jndiConfig:
-      name: jdbc/HTTP_ANALYTICS_DB
-      useJndiReference: false
-    definition:
-      type: RDBMS
-      configuration:
-        jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/HTTP_ANALYTICS_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE'
-        username: wso2carbon
-        password: wso2carbon
-        driverClassName: org.h2.Driver
-        maxPoolSize: 30
-        idleTimeout: 60000
-        connectionTestQuery: SELECT 1
-        validationTimeout: 30000
-        isAutoCommit: false
-  - name: Twitter_Analytics
-    description: The datasource used for Twitter Analytics dashboard
-    jndiConfig:
-      name: jdbc/Twitter_Analytics
-      useJndiReference: false
-    definition:
-      type: RDBMS
-      configuration:
-        jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/Twitter_Analytics;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE'
-        username: wso2carbon
-        password: wso2carbon
-        driverClassName: org.h2.Driver
-        maxPoolSize: 30
-        idleTimeout: 60000
-        connectionTestQuery: SELECT 1
-        validationTimeout: 30000
-        isAutoCommit: false
-  - name: Message_Tracing_DB
-    description: "The datasource used for message tracer to store span information."
-    jndiConfig:
-      name: jdbc/Message_Tracing_DB
-    definition:
-      type: RDBMS
-      configuration:
-        jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/dashboard/database/MESSAGE_TRACING_DB;AUTO_SERVER=TRUE'
-        username: wso2carbon
-        password: wso2carbon
-        driverClassName: org.h2.Driver
-        maxPoolSize: 30
-        idleTimeout: 60000
-        connectionTestQuery: SELECT 1
-        validationTimeout: 30000
-        isAutoCommit: false
 
   - name: IS_ANALYTICS_DB
     description: "The data source used for WSO2 IS Analytics statistics"
@@ -381,6 +314,23 @@ wso2.datasources:
         idleTimeout: 60000
         validationTimeout: 30000
         isAutoCommit: false
+#  - name: SAMPLE_DB
+#    description: Sample datasource used for gadgets generation wizard
+#    jndiConfig:
+#      name: jdbc/SAMPLE_DB
+#      useJndiReference: true
+#    definition:
+#      type: RDBMS
+#      configuration:
+#        jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/SAMPLE_DB;IFEXISTS=TRUE;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE'
+#        username: wso2carbon
+#        password: wso2carbon
+#        driverClassName: org.h2.Driver
+#        maxPoolSize: 10
+#        idleTimeout: 60000
+#        connectionTestQuery: SELECT 1
+#        validationTimeout: 30000
+#        isAutoCommit: false
 
 wso2.business.rules.manager:
   datasource: BUSINESS_RULES_DB
@@ -427,3 +377,21 @@ wso2.transport.http:
       keyStoreFile: "<%= @default_listener_keystore %>"
       keyStorePassword: <%= @default_listener_keystore_password %>
       certPass: <%= @default_listener_keystore_cert_pass %>
+
+# Authentication configuration
+auth.configs:
+  type: 'local'        # Type of the IdP client used
+  userManager:
+    adminRole: admin   # Admin role which is granted all permissions
+    userStore:         # User store
+      users:
+        -
+          user:
+            username: admin
+            password: YWRtaW4=
+            roles: 1
+      roles:
+        -
+          role:
+            id: 1
+            displayName: admin
diff --git a/modules/is_analytics_worker/manifests/params.pp b/modules/is_analytics_worker/manifests/params.pp
@@ -20,7 +20,7 @@
   $user = 'wso2carbon'
   $user_group = 'wso2'
   $product = 'wso2is-analytics'
-  $product_version = '5.7.0'
+  $product_version = '5.8.0'
   $profile = 'worker'
   $service_name = "${product}-${profile}"
 

diff --git a/modules/is_analytics_worker_master/build.sh b/modules/is_analytics_worker_master/build.sh
@@ -22,7 +22,7 @@
 # Build artifacts and versions
 : ${product:="wso2is-analytics"}
 : ${profile:="worker"}
-: ${product_version:="5.7.0"}
+: ${product_version:="5.8.0"}
 : ${products_dir:="/usr/local/wso2"}
 : ${distribution_path:=${products_dir}"/"${product}"/"${profile}"/"${product_version}}
 : ${install_path:=${distribution_path}"/"${product}"-"${product_version}}

diff --git a/modules/is_analytics_worker_master/manifests/params.pp b/modules/is_analytics_worker_master/manifests/params.pp
@@ -20,7 +20,7 @@
   $user = 'wso2carbon'
   $user_group = 'wso2'
   $product = 'wso2is-analytics'
-  $product_version = '5.7.0'
+  $product_version = '5.8.0'
   $profile = 'worker'
   $service_name = "${product}-${profile}"
 
@@ -40,6 +40,13 @@
   $message_tracing_db_password = 'wso2carbon'
   $message_tracing_db_driver = 'org.h2.Driver'
 
+  # transport.http configuration
+  $default_listener_host = '0.0.0.0'
+  $msf4j_host = '0.0.0.0'
+  $msf4j_listener_keystore = '${carbon.home}/resources/security/wso2carbon.jks'
+  $msf4j_listener_keystore_password = 'wso2carbon'
+  $msf4j_listener_keystore_cert_pass = 'wso2carbon'
+
   # Directories
   $products_dir = "/usr/local/wso2"
 

diff --git a/modules/is_analytics_worker_master/templates/carbon-home/conf/worker/deployment.yaml.erb b/modules/is_analytics_worker_master/templates/carbon-home/conf/worker/deployment.yaml.erb
@@ -298,20 +298,20 @@ wso2.securevault:
 wso2.datasources:
   dataSources:
     -
+      name: WSO2_CLUSTER_DB
+      description: "The datasource used by cluster coordinators in HA deployment"
       definition:
+        type: RDBMS
         configuration:
           connectionTestQuery: "SELECT 1"
           driverClassName: org.h2.Driver
           idleTimeout: 60000
           isAutoCommit: false
-          jdbcUrl: "jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/WSO2_CARBON_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000"
+          jdbcUrl: "jdbc:h2:${sys:carbon.home}/wso2/${sys:wso2.runtime}/database/WSO2_CLUSTER_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;AUTO_SERVER=TRUE"
           maxPoolSize: 10
           password: wso2carbon
           username: wso2carbon
           validationTimeout: 30000
-        type: RDBMS
-      description: "The datasource used for registry and user manager"
-      name: WSO2_CARBON_DB
 
     # carbon metrics data source
     - name: WSO2_METRICS_DB
@@ -349,58 +349,6 @@ wso2.datasources:
           validationTimeout: 30000
           isAutoCommit: false
 
-    - name: HTTP_ANALYTICS_DB
-      description: The datasource used for HTTP Analytics dashboard
-      jndiConfig:
-        name: jdbc/HTTP_ANALYTICS_DB
-        useJndiReference: false
-      definition:
-        type: RDBMS
-        configuration:
-          jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/HTTP_ANALYTICS_DB;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE'
-          username: wso2carbon
-          password: wso2carbon
-          driverClassName: org.h2.Driver
-          maxPoolSize: 30
-          idleTimeout: 60000
-          connectionTestQuery: SELECT 1
-          validationTimeout: 30000
-          isAutoCommit: false
-    - name: Twitter_Analytics
-      description: The datasource used for Twitter Analytics dashboard
-      jndiConfig:
-        name: jdbc/Twitter_Analytics
-        useJndiReference: false
-      definition:
-        type: RDBMS
-        configuration:
-          jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/Twitter_Analytics;DB_CLOSE_ON_EXIT=FALSE;LOCK_TIMEOUT=60000;MVCC=TRUE;AUTO_SERVER=TRUE'
-          username: wso2carbon
-          password: wso2carbon
-          driverClassName: org.h2.Driver
-          maxPoolSize: 30
-          idleTimeout: 60000
-          connectionTestQuery: SELECT 1
-          validationTimeout: 30000
-          isAutoCommit: false
-
-    - name: Message_Tracing_DB
-      description: "The datasource used for message tracer to store span information."
-      jndiConfig:
-        name: jdbc/Message_Tracing_DB
-      definition:
-        type: RDBMS
-        configuration:
-          jdbcUrl: '<%= @message_tracing_db_url %>'
-          username: <%= @message_tracing_db_username %>
-          password: <%= @message_tracing_db_password %>
-          driverClassName: <%= @message_tracing_db_driver %>
-          maxPoolSize: 30
-          idleTimeout: 60000
-          connectionTestQuery: SELECT 1
-          validationTimeout: 30000
-          isAutoCommit: false
-
     - name: IS_ANALYTICS_DB
       description: "The data source used for WSO2 IS Analytics statistics"
       jndiConfig:
@@ -433,22 +381,6 @@ wso2.datasources:
           validationTimeout: 30000
           isAutoCommit: false
 
-    - name: WSO2AM_MGW_ANALYTICS_DB
-      description: "The datasource used for APIM MGW analytics data."
-      jndiConfig:
-        name: jdbc/WSO2AM_MGW_ANALYTICS_DB
-      definition:
-        type: RDBMS
-        configuration:
-          jdbcUrl: 'jdbc:h2:${sys:carbon.home}/wso2/worker/database/WSO2AM_MGW_ANALYTICS_DB;AUTO_SERVER=TRUE'
-          username: wso2carbon
-          password: wso2carbon
-          driverClassName: org.h2.Driver
-          maxPoolSize: 50
-          idleTimeout: 60000
-          connectionTestQuery: SELECT 1
-          validationTimeout: 30000
-          isAutoCommit: false
 
 siddhi:
   extensions:
@@ -479,11 +411,29 @@ cluster.config:
   groupId:  is.analytics
   coordinationStrategyClass: org.wso2.carbon.cluster.coordinator.rdbms.RDBMSCoordinationStrategy
   strategyConfig:
-    datasource: WSO2_CARBON_DB
+    datasource: WSO2_CLUSTER_DB
     heartbeatInterval: 1000
     heartbeatMaxRetry: 2
     eventPollingInterval: 1000
 
+# Authentication configuration
+auth.configs:
+  type: 'local'        # Type of the IdP client used
+  userManager:
+    adminRole: admin   # Admin role which is granted all permissions
+    userStore:         # User store
+      users:
+        -
+          user:
+            username: admin
+            password: YWRtaW4=
+            roles: 1
+      roles:
+        -
+          role:
+            id: 1
+            displayName: admin
+
   # Sample of deployment.config for Two node HA
 #deployment.config:
 #  type: ha

diff --git a/modules/is_master/build.sh b/modules/is_master/build.sh
@@ -21,7 +21,7 @@
 
 # Build artifacts and versions
 : ${product:="wso2is"}
-: ${product_version:="5.7.0"}
+: ${product_version:="5.8.0"}
 : ${products_dir:="/usr/local/wso2"}
 : ${distribution_path:=${products_dir}"/"${product}"/"${product_version}}
 : ${install_path:=${distribution_path}"/"${product}"-"${product_version}}

diff --git a/modules/is_master/manifests/params.pp b/modules/is_master/manifests/params.pp
@@ -19,7 +19,7 @@
   $user = 'wso2carbon'
   $user_group = 'wso2'
   $product = 'wso2is'
-  $product_version = '5.7.0'
+  $product_version = '5.8.0'
   $service_name = 'wso2is'
 
   $template_list = [