diff options
author | Mike Elliott <mike.elliott@amdocs.com> | 2018-04-23 18:06:42 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@onap.org> | 2018-04-23 18:06:42 +0000 |
commit | a33d337d7a133ba26ac519c62e50b4c006a21bd5 (patch) | |
tree | 4d2e616e4e751212f99afa80c599c58af543cc30 | |
parent | 21d36d8bd385da4faeeac64e85f5d12852023095 (diff) | |
parent | c4658874bf3901f65315a9370cb86267060b01cb (diff) |
Merge "Fix Log logstash healthcheck port number"
-rwxr-xr-x | kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py | 2 | ||||
-rwxr-xr-x | kubernetes/robot/resources/config/eteshare/config/vm_properties.py | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py index 1915efedab..571ea9f20d 100755 --- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py @@ -92,5 +92,5 @@ GLOBAL_HEAT_TEMPLATES_FOLDER = "/share/heat" # Log info GLOBAL_LOG_SERVER_PROTOCOL = "http" GLOBAL_LOG_ELASTICSEARCH_PORT = "9200" -GLOBAL_LOG_LOGSTASH_PORT = "5044" +GLOBAL_LOG_LOGSTASH_PORT = "9600" GLOBAL_LOG_KIBANA_PORT = "5601" diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py index 47d42bcfb3..7aa9581580 100755 --- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py @@ -15,7 +15,7 @@ GLOBAL_INJECTED_EXTERNAL_DNS = "N/A" GLOBAL_INJECTED_GERRIT_BRANCH = "master" GLOBAL_INJECTED_LOG_ELASTICSEARCH_IP_ADDR = "log-es.{{include "common.namespace" .}}" GLOBAL_INJECTED_LOG_KIBANA_IP_ADDR = "log-kibana.{{include "common.namespace" .}}" -GLOBAL_INJECTED_LOG_LOGSTASH_IP_ADDR = "log-ls.{{include "common.namespace" .}}" +GLOBAL_INJECTED_LOG_LOGSTASH_IP_ADDR = "log-ls-http.{{include "common.namespace" .}}" GLOBAL_INJECTED_KEYSTONE = "{{ .Values.openStackKeyStoneUrl }}" GLOBAL_INJECTED_MR_IP_ADDR = "message-router.{{include "common.namespace" .}}" GLOBAL_INJECTED_MSO_IP_ADDR = "so.{{include "common.namespace" .}}" @@ -100,4 +100,4 @@ GLOBAL_INJECTED_PROPERTIES = { "GLOBAL_INJECTED_VID_IP_ADDR" : "{{.Release.Name}}-vid.{{include "common.namespace" .}}", "GLOBAL_INJECTED_VM_FLAVOR" : "{{ .Values.openStackFlavourMedium }}", "GLOBAL_INJECTED_VNFSDK_IP_ADDR" : "{{.Release.Name}}-vnfsdk.{{include "common.namespace" .}}" -}
\ No newline at end of file +} |