diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2018-05-07 13:48:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-07 13:48:00 +0000 |
| commit | 7ffafb99796a4af35f2cbb5c47c648f49cafcc0b (patch) | |
| tree | a6d4dd33d658f442413d1f57e9d67f92c6c03e5a /kubernetes/policy | |
| parent | 891e1d12cccb1986238b48e7bd2e25476dcfa90c (diff) | |
| parent | 823691fb0dbf7538b5d3319c1b3afdb051c001dd (diff) | |
Merge "oom tweaks in pap configuration for pdp-x pooling"
Diffstat (limited to 'kubernetes/policy')
| -rw-r--r-- | kubernetes/policy/charts/pdp/resources/config/pe/pdp.conf | 4 | ||||
| -rw-r--r-- | kubernetes/policy/resources/config/pe/pap.conf | 2 | ||||
| -rw-r--r-- | kubernetes/policy/values.yaml | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/kubernetes/policy/charts/pdp/resources/config/pe/pdp.conf b/kubernetes/policy/charts/pdp/resources/config/pe/pdp.conf index 7b13116e34..8e0b88213d 100644 --- a/kubernetes/policy/charts/pdp/resources/config/pe/pdp.conf +++ b/kubernetes/policy/charts/pdp/resources/config/pe/pdp.conf @@ -30,7 +30,7 @@ TOMCAT_X_MX_MB=1024 UEB_CLUSTER=message-router REST_PAP_URL=http://{{ .Values.global.pap.nameOverride }}:{{.Values.config.papPort}}/pap/ -REST_PDP_ID=http://{{ include "common.servicename" . }}:{{.Values.service.externalPort}}/pdp/ +REST_PDP_ID=http://${{"{{"}}FQDN{{"}}"}}:{{.Values.service.externalPort}}/pdp/ REST_PDP_CONFIG=/opt/app/policy/servers/pdp/bin/config REST_PDP_WEBAPPS=/opt/app/policy/servers/pdp/webapps REST_PDP_REGISTER=true @@ -46,7 +46,7 @@ PDP_PAP_PDP_HTTP_PASSWORD=alpha123 node_type=pdp_xacml resource_name=pdp_1 -dependency_groups=pdplp_1;brmsgw_1 +dependency_groups=brmsgw_1 test_via_jmx=true # diff --git a/kubernetes/policy/resources/config/pe/pap.conf b/kubernetes/policy/resources/config/pe/pap.conf index 39199d7f1a..ae9d47c491 100644 --- a/kubernetes/policy/resources/config/pe/pap.conf +++ b/kubernetes/policy/resources/config/pe/pap.conf @@ -39,7 +39,7 @@ REST_ADMIN_REPOSITORY=repository REST_ADMIN_WORKSPACE=workspace # PDP related properties -PAP_PDP_URL=http://{{ .Release.Name }}-{{ .Values.global.pdp.nameOverride }}-0.{{ .Values.global.pdp.nameOverride }}:{{ .Values.config.pdpPort }}/pdp/,http://{{ .Release.Name }}-{{ .Values.global.pdp.nameOverride }}-1.{{ .Values.global.pdp.nameOverride }}:{{ .Values.config.pdpPort }}/pdp/ +PAP_PDP_URL=http://{{ .Release.Name }}-{{ .Values.global.pdp.nameOverride }}-0.{{ .Values.global.pdp.nameOverride }}.{{ include "common.namespace" . }}.svc.cluster.local:{{ .Values.config.pdpPort }}/pdp/,testpdp,alpha123;http://{{ .Release.Name }}-{{ .Values.global.pdp.nameOverride }}-1.{{ .Values.global.pdp.nameOverride }}.{{ include "common.namespace" . }}.svc.cluster.local:{{ .Values.config.pdpPort }}/pdp/ PAP_PDP_HTTP_USER_ID=testpdp PAP_PDP_HTTP_PASSWORD=alpha123 diff --git a/kubernetes/policy/values.yaml b/kubernetes/policy/values.yaml index 4ab6e11ec7..c2c9747747 100644 --- a/kubernetes/policy/values.yaml +++ b/kubernetes/policy/values.yaml @@ -65,7 +65,7 @@ debugEnabled: false # application configuration config: - preloadPolicies: true + preloadPolicies: false pdpPort: 8081 # default number of instances |