From df5484e88df47c754ffa4d3d0f0096ff69cae3dc Mon Sep 17 00:00:00 2001 From: jhh Date: Mon, 6 Apr 2020 15:08:35 -0500 Subject: Add healthcheck for legacy PAP Issue-ID: POLICY-2473 Signed-off-by: jhh Change-Id: Ib6c129b2cc9e9c81335da66df6d6d178de0cbc61 --- .../configmaps/feature-healthcheck.properties | 47 ++++++++++++++++++++++ .../drools/resources/secrets/credentials.conf | 6 +++ kubernetes/policy/charts/drools/values.yaml | 8 ++++ 3 files changed, 61 insertions(+) create mode 100644 kubernetes/policy/charts/drools/resources/configmaps/feature-healthcheck.properties (limited to 'kubernetes/policy/charts') diff --git a/kubernetes/policy/charts/drools/resources/configmaps/feature-healthcheck.properties b/kubernetes/policy/charts/drools/resources/configmaps/feature-healthcheck.properties new file mode 100644 index 0000000000..189248ffb3 --- /dev/null +++ b/kubernetes/policy/charts/drools/resources/configmaps/feature-healthcheck.properties @@ -0,0 +1,47 @@ +### +# ============LICENSE_START======================================================= +# feature-healthcheck +# ================================================================================ +# Copyright (C) 2020 AT&T Intellectual Property. All rights reserved. +# ================================================================================ +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ============LICENSE_END========================================================= +### + +http.server.services=HEALTHCHECK +http.server.services.HEALTHCHECK.host=0.0.0.0 +http.server.services.HEALTHCHECK.port=6969 +http.server.services.HEALTHCHECK.restClasses=org.onap.policy.drools.healthcheck.RestHealthCheck +http.server.services.HEALTHCHECK.managed=false +http.server.services.HEALTHCHECK.swagger=true +http.server.services.HEALTHCHECK.userName=${envd:HEALTHCHECK_USER} +http.server.services.HEALTHCHECK.password=${envd:HEALTHCHECK_PASSWORD} +http.server.services.HEALTHCHECK.https=true +http.server.services.HEALTHCHECK.aaf=${envd:AAF:false} +http.server.services.HEALTHCHECK.serialization.provider=org.onap.policy.common.gson.JacksonHandler,org.onap.policy.common.endpoints.http.server.YamlJacksonHandler + +http.client.services=PAP + +http.client.services.PAP.host={{ .Values.global.pap.nameOverride }} +http.client.services.PAP.port=9091 +http.client.services.PAP.contextUriPath=pap/test +http.client.services.PAP.https=true +http.client.services.PAP.userName=${envd:PAP_LEGACY_USERNAME} +http.client.services.PAP.password=${envd:PAP_LEGACY_PASSWORD} + +http.client.services.PDP.host={{ .Values.global.pdp.nameOverride }} +http.client.services.PDP.port=8081 +http.client.services.PDP.contextUriPath=pdp/test +http.client.services.PDP.https=true +http.client.services.PDP.userName=${envd:PDP_LEGACY_USERNAME} +http.client.services.PDP.password=${envd:PDP_LEGACY_PASSWORD} diff --git a/kubernetes/policy/charts/drools/resources/secrets/credentials.conf b/kubernetes/policy/charts/drools/resources/secrets/credentials.conf index ee2acc40f2..bb2b90c1a7 100644 --- a/kubernetes/policy/charts/drools/resources/secrets/credentials.conf +++ b/kubernetes/policy/charts/drools/resources/secrets/credentials.conf @@ -34,9 +34,15 @@ POLICY_PDP_PAP_API_SECRET={{.Values.dmaap.pap.secret}} PAP_USERNAME={{.Values.pap.user}} PAP_PASSWORD={{.Values.pap.password}} +PAP_LEGACY_USERNAME={{.Values.papl.user}} +PAP_LEGACY_PASSWORD={{.Values.papl.password}} + PDP_USERNAME={{.Values.pdp.user}} PDP_PASSWORD={{.Values.pdp.password}} +PDP_LEGACY_USERNAME={{.Values.pdpl.user}} +PDP_LEGACY_PASSWORD={{.Values.pdpl.password}} + AAI_USERNAME={{.Values.aai.user}} AAI_PASSWORD={{.Values.aai.password}} diff --git a/kubernetes/policy/charts/drools/values.yaml b/kubernetes/policy/charts/drools/values.yaml index b62772d57f..58ce2d0455 100644 --- a/kubernetes/policy/charts/drools/values.yaml +++ b/kubernetes/policy/charts/drools/values.yaml @@ -115,6 +115,14 @@ pdp: user: healthcheck password: zb!XztG34 +papl: + user: testpap + password: alpha123 + +pdpl: + user: testpdp + password: alpha123 + aai: user: policy@policy.onap.org password: demo123456! -- cgit 1.2.3-korg