diff options
| author |   Jack Lucas <jflos@sonoris.net> | 2021-03-16 08:54:27 -0400 |
|---|---|---|
| committer |   Sylvain Desbureaux <sylvain.desbureaux@orange.com> | 2021-03-20 19:14:34 +0000 |
| commit | 7e843bf8e298d4e8ce13f7f46b2ce83ebd044be0 (patch) | |
| tree | ca56e54ae5bedb3373bc37ff9673b054a42ca7a3 | |
| parent | fde94076e689727e8a2c3c5147ce1242dc225f87 (diff) | |
[ROBOT] Add properties for DCAE MS healthcheck
Add global variables needed for robot to invoke MS healthcheck.
Issue-ID: DCAEGEN2-2660
Issue-ID: DCAEGEN2-2615
Signed-off-by: Jack Lucas <jflos@sonoris.net>
Change-Id: I44fb209de59c077a7e446acac5a4c6ded6995775
| -rw-r--r-- | kubernetes/robot/resources/config/eteshare/config/robot_properties.py | 7 | ||||
| -rw-r--r-- | kubernetes/robot/values.yaml | 2 |
2 files changed, 9 insertions, 0 deletions
diff --git a/kubernetes/robot/resources/config/eteshare/config/robot_properties.py b/kubernetes/robot/resources/config/eteshare/config/robot_properties.py index 807f070aa0..674a416dc2 100644 --- a/kubernetes/robot/resources/config/eteshare/config/robot_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/robot_properties.py @@ -25,6 +25,7 @@ GLOBAL_INJECTED_CLI_IP_ADDR = '{{include "robot.ingress.svchost" (dict "root" . GLOBAL_INJECTED_CLOUD_ENV = 'openstack' GLOBAL_INJECTED_DCAE_COLLECTOR_IP = "{{ .Values.dcaeCollectorIp }}" GLOBAL_INJECTED_DCAE_IP_ADDR = '{{include "robot.ingress.svchost" (dict "root" . "hostname" "dcae-healthcheck") }}' +GLOBAL_INJECTED_DCAE_MS_IP_ADDR = '{{include "robot.ingress.svchost" (dict "root" . "hostname" "dcae-ms-healthcheck") }}' GLOBAL_INJECTED_DCAE_VES_HOST = '{{include "robot.ingress.svchost" (dict "root" . "hostname" "dcae-ves-collector") }}' GLOBAL_INJECTED_DMAAP_DR_PROV_IP_ADDR = '{{include "robot.ingress.svchost" (dict "root" . "hostname" "dmaap-dr-prov") }}' GLOBAL_INJECTED_DMAAP_DR_NODE_IP_ADDR = '{{include "robot.ingress.svchost" (dict "root" . "hostname" "dmaap-dr-node") }}' @@ -165,6 +166,12 @@ GLOBAL_DCAE_HEALTH_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . GLOBAL_DCAE_USERNAME = '{{ .Values.dcaeUsername }}' GLOBAL_DCAE_PASSWORD = '{{ .Values.dcaePassword}}' GLOBAL_DCAE_AUTHENTICATION = [GLOBAL_DCAE_USERNAME, GLOBAL_DCAE_PASSWORD] +# dcae microservice info - everything is from the private oam network (also called onap private network) +GLOBAL_DCAE_MS_SERVER_PROTOCOL = "http" +GLOBAL_DCAE_MS_HEALTH_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "dcae-healthcheck" "port" 8080) }}' +GLOBAL_DCAE_MS_USERNAME = '{{ .Values.dcaeMsUsername }}' +GLOBAL_DCAE_MS_PASSWORD = '{{ .Values.dcaeMsPassword}}' +GLOBAL_DCAE_AUTHENTICATION = [GLOBAL_DCAE_USERNAME, GLOBAL_DCAE_PASSWORD] # dcae hv-ves info GLOBAL_DCAE_HVVES_SERVER_NAME = '{{include "robot.ingress.svchost" (dict "root" . "hostname" "dcae-hv-ves-collector") }}' GLOBAL_DCAE_HVVES_SERVER_PORT = '{{include "robot.ingress.port" (dict "root" . "hostname" "dcae-hv-ves-collector" "port" 6061) }}' diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml index f8120973e2..6f54c6b340 100644 --- a/kubernetes/robot/values.yaml +++ b/kubernetes/robot/values.yaml @@ -325,6 +325,8 @@ appcPassword: "demo123456!" # DCAE dcaeUsername: "dcae@dcae.onap.org" dcaePassword: "demo123456!" +dcaeMsUsername: "dcae@dcae.onap.org" +dcaeMsPassword: "demo123456!" # DROOLS droolsUsername: "demo@people.osaaf.org" droolsPassword: "demo123456!" |