Merge "Bump up clamp to 4.1.2"

diff --git a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties b/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
index d2dacf8..ec2ce6b 100755 (executable)
--- a/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
+++ b/kubernetes/cds/charts/cds-blueprints-processor/resources/config/application.properties
@@ -18,13 +18,11 @@
 # Load Resource Source Mappings
 resourceSourceMappings=processor-db=source-db,input=source-input,default=source-default,sdnc=source-rest,aai-data=source-rest,capability=source-capability,rest=source-rest,script=source-capability
 
-# Controller Blueprints Core Configuration
 # Blueprint Processor File Execution and Handling Properties
 blueprintsprocessor.blueprintDeployPath=/opt/app/onap/blueprints/deploy
 blueprintsprocessor.blueprintArchivePath=/opt/app/onap/blueprints/archive
 blueprintsprocessor.blueprintWorkingPath=/opt/app/onap/blueprints/working
 
-# Controller Blueprint Load Configurations
 # blueprints.load.initial-data may be overridden by ENV variables
 blueprintsprocessor.loadInitialData=true
 blueprintsprocessor.loadBluePrint=true
@@ -43,7 +41,7 @@ blueprintsprocessor.grpcEnable=true
 blueprintsprocessor.httpPort=8080
 blueprintsprocessor.grpcPort=9111
 
-# Primary Database Configuration
+# db
 blueprintsprocessor.db.url=jdbc:mysql://cds-db:3306/sdnctl
 blueprintsprocessor.db.username=sdnctl
 blueprintsprocessor.db.password=sdnctl
@@ -53,6 +51,12 @@ blueprintsprocessor.db.hibernateDDLAuto=update
 blueprintsprocessor.db.hibernateNamingStrategy=org.hibernate.cfg.ImprovedNamingStrategy
 blueprintsprocessor.db.hibernateDialect=org.hibernate.dialect.MySQL5InnoDBDialect
 
+# processor-db endpoint
+blueprintsprocessor.db.processor-db.type=maria-db
+blueprintsprocessor.db.processor-db.url=jdbc:mysql://mariadb-galera:3306/sdnctl
+blueprintsprocessor.db.processor-db.username=root
+blueprintsprocessor.db.processor-db.password=secretpassword
+
 # Python executor
 blueprints.processor.functions.python.executor.executionPath=/opt/app/onap/scripts/jython/ccsdk_blueprints
 blueprints.processor.functions.python.executor.modulePaths=/opt/app/onap/scripts/jython/ccsdk_blueprints,/opt/app/onap/scripts/jython/ccsdk_netconf,/opt/app/onap/scripts/jython/ccsdk_restconf

diff --git a/kubernetes/policy/charts/brmsgw/values.yaml b/kubernetes/policy/charts/brmsgw/values.yaml
index 57ff2f4..ef817f0 100644 (file)
--- a/kubernetes/policy/charts/brmsgw/values.yaml
+++ b/kubernetes/policy/charts/brmsgw/values.yaml
@@ -26,7 +26,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-pe:1.5.1
+image: onap/policy-pe:1.5.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/charts/pdp/values.yaml b/kubernetes/policy/charts/pdp/values.yaml
index 07f1794..20f4614 100644 (file)
--- a/kubernetes/policy/charts/pdp/values.yaml
+++ b/kubernetes/policy/charts/pdp/values.yaml
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-pe:1.5.1
+image: onap/policy-pe:1.5.2
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/policy/charts/policy-distribution/resources/config/config.json b/kubernetes/policy/charts/policy-distribution/resources/config/config.json
index 5591e58..5e1c80f 100644 (file)
--- a/kubernetes/policy/charts/policy-distribution/resources/config/config.json
+++ b/kubernetes/policy/charts/policy-distribution/resources/config/config.json
@@ -52,6 +52,11 @@
                         "forwarderType":"ApexForwarder",
                         "forwarderClassName":"org.onap.policy.distribution.forwarding.apex.pdp.ApexPdpPolicyForwarder",
                         "forwarderConfigurationName": "apexForwarderConfiguration"
+                    },
+                    "LifeCycleApiForwarder":{
+                        "forwarderType":"LifeCycleAPI",
+                        "forwarderClassName":"org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiPolicyForwarder",
+                        "forwarderConfigurationName": "lifecycleApiConfiguration"
                     }
                 }
             }
@@ -99,8 +104,8 @@
         "apexDecoderConfiguration":{
             "parameterClassName":"org.onap.policy.distribution.reception.decoding.policy.file.PolicyDecoderFileInCsarToPolicyParameterGroup",
             "parameters":{
-                "policyFileName": "SamplePolicyModelJAVASCRIPT",
-                "policyType": "APEX"
+                "policyFileName": "apex_policy",
+                "policyTypeFileName": "apex_policy_type"
             }
         }
     },
@@ -126,6 +131,25 @@
                 "ignoreConflicts": true,
                 "forceUpdate": true
             }
+        },
+        "lifecycleApiConfiguration":{
+            "parameterClassName":"org.onap.policy.distribution.forwarding.lifecycle.api.LifecycleApiForwarderParameters",
+            "parameters":{
+                "apiParameters": {
+                "hostName": "policy-api",
+                "port": 6969,
+                  "userName": "healthcheck",
+                  "password": "zb!XztG34"
+                 },
+                "papParameters": {
+                  "hostName": "policy-pap",
+                  "port": 6969,
+                 "userName": "healthcheck",
+                "password": "zb!XztG34"
+                },
+                "isHttps": true,
+                "deployPolicies": true
+             }
         }
     }
 }

diff --git a/kubernetes/policy/charts/policy-distribution/values.yaml b/kubernetes/policy/charts/policy-distribution/values.yaml
index 2cc0d44..04257a4 100644 (file)
--- a/kubernetes/policy/charts/policy-distribution/values.yaml
+++ b/kubernetes/policy/charts/policy-distribution/values.yaml
@@ -28,7 +28,7 @@ global:
 #################################################################
 # application image
 repository: nexus3.onap.org:10001
-image: onap/policy-distribution:2.2.0
+image: onap/policy-distribution:2.2.1
 pullPolicy: Always
 
 # flag to enable debugging - application support required

diff --git a/kubernetes/robot b/kubernetes/robot
index e319430..79abf3c 160000 (submodule)
--- a/kubernetes/robot
+++ b/kubernetes/robot
@@ -1 +1 @@
-Subproject commit e319430e199814608529493c30579e15a481a070
+Subproject commit 79abf3c8548fcef3ec0db7d722b1c4e9312d95d6