disable feature-pooling

- reduces replica counts to 1 (still can be scaled out through helm upgrades)
  for pdp-x and pdp-ds.
- disabled feature pooling
- forces to get drl template from beijing release.

Change-Id: Ifd565ff0fbb7811f78f0fae83080c5398e5de51e
Issue-ID: POLICY-879
Signed-off-by: Jorge Hernandez <jh1730@att.com>

4 files changed, 10 insertions, 11 deletions

diff --git a/kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/drools-tweaks.sh b/kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/drools-tweaks.sh
index 218cd8aead..5f504e2c65 100644
--- a/kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/drools-tweaks.sh
+++ b/kubernetes/policy/charts/drools/resources/config/opt/policy/config/drools/drools-tweaks.sh
@@ -16,7 +16,6 @@
 
 
 "${POLICY_HOME}"/bin/features enable healthcheck
-"${POLICY_HOME}"/bin/features enable pooling-dmaap
 "${POLICY_HOME}"/bin/features enable distributed-locking
 
 "${POLICY_HOME}"/bin/db-migrator -s pooling -o upgrade
@@ -25,16 +24,16 @@
 # so not to lose any configuration updates
 
 echo
-echo "creating PDPD-CONFIGURATION topic"
+echo "testing publish to PDPD-CONFIGURATION topic"
 echo
 
-curl --silent --connect-timeout 60 -X POST --header "Content-Type: application/json" -d "{}"   http://message-router:3904/events/PDPD-CONFIGURATION
+curl --silent --connect-timeout 15 -X POST --header "Content-Type: application/json" -d "{}"   http://message-router:3904/events/PDPD-CONFIGURATION
 
 echo
-echo "removing PDPD-CONFIGURATION topic dummy message"
+echo "testing subscribe to PDPD-CONFIGURATION topic "
 echo
 
-curl --silent --connect-timeout 60 -X GET http://message-router:3904/events/PDPD-CONFIGURATION/1/1?timeout=15000
+curl --silent --connect-timeout 15 -X GET http://message-router:3904/events/PDPD-CONFIGURATION/1/1?timeout=5000
 
 # for resiliency/scalability scenarios, check to see
 # if there's an amsterdam artifact  already deployed
@@ -47,7 +46,7 @@ echo
 echo "checking if there are amsterdam policies already deployed .."
 echo
 
-AMSTERDAM_VERSION=$(curl --silent --connect-timeout 60 -X GET "http://nexus:8081/nexus/service/local/artifact/maven/resolve?r=releases&g=org.onap.policy-engine.drools.amsterdam&a=policy-amsterdam-rules&v=RELEASE" | grep -Po "(?<=<version>).*(?=</version>)")
+AMSTERDAM_VERSION=$(curl --silent --connect-timeout 20 -X GET "http://nexus:8081/nexus/service/local/artifact/maven/resolve?r=releases&g=org.onap.policy-engine.drools.amsterdam&a=policy-amsterdam-rules&v=RELEASE" | grep -Po "(?<=<version>).*(?=</version>)")
 
 if [[ -z ${AMSTERDAM_VERSION} ]]; then
 	echo "no amsterdam policies have been found .."
diff --git a/kubernetes/policy/charts/drools/values.yaml b/kubernetes/policy/charts/drools/values.yaml
index 1bc09a7d0b..5a8e936253 100644
--- a/kubernetes/policy/charts/drools/values.yaml
+++ b/kubernetes/policy/charts/drools/values.yaml
@@ -38,7 +38,7 @@ config:
   nexusPort: 8081
 
 # default number of instances
-replicaCount: 2
+replicaCount: 1
 
 nodeSelector: {}
 
@@ -46,14 +46,14 @@ affinity: {}
 
 # probe configuration parameters
 liveness:
-  initialDelaySeconds: 10
+  initialDelaySeconds: 60
   periodSeconds: 10
   # necessary to disable liveness probe when setting breakpoints
   # in debugger so K8s doesn't restart unresponsive container
   enabled: true
 
 readiness:
-  initialDelaySeconds: 10
+  initialDelaySeconds: 60
   periodSeconds: 10
 
 service:
diff --git a/kubernetes/policy/charts/pdp/values.yaml b/kubernetes/policy/charts/pdp/values.yaml
index 707b975726..45d8d60f5c 100644
--- a/kubernetes/policy/charts/pdp/values.yaml
+++ b/kubernetes/policy/charts/pdp/values.yaml
@@ -38,7 +38,7 @@ config:
   papPort: 9091
 
 # default number of instances
-replicaCount: 2
+replicaCount: 1
 
 nodeSelector: {}
 
diff --git a/kubernetes/policy/resources/config/pe/push-policies.sh b/kubernetes/policy/resources/config/pe/push-policies.sh
index 5172086d8a..dcd3afb9ad 100644
--- a/kubernetes/policy/resources/config/pe/push-policies.sh
+++ b/kubernetes/policy/resources/config/pe/push-policies.sh
@@ -22,7 +22,7 @@ echo "Upload BRMS Param Template"
 
 sleep 2
 
-wget -O cl-amsterdam-template.drl https://git.onap.org/policy/drools-applications/plain/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl
+wget -O cl-amsterdam-template.drl https://git.onap.org/policy/drools-applications/plain/controlloop/templates/archetype-cl-amsterdam/src/main/resources/archetype-resources/src/main/resources/__closedLoopControlName__.drl?h=beijing
 
 sleep 2