diff options
Diffstat (limited to 'kubernetes/robot')
| -rw-r--r-- | kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py | 14 | ||||
| -rw-r--r-- | kubernetes/robot/templates/deployment.yaml | 2 | ||||
| -rwxr-xr-x | kubernetes/robot/values.yaml | 3 |
3 files changed, 9 insertions, 10 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 bbeafd9fca..a3e25e7418 100644 --- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Amdocs, Bell Canada +# Copyright (c) 2018 Amdocs, Bell Canada, and others # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,17 +19,15 @@ GLOBAL_AAF_PASSWORD = "demo123456!" # aai info - everything is from the private oam network (also called onap private network) GLOBAL_AAI_SERVER_PROTOCOL = "https" GLOBAL_AAI_SERVER_PORT = "8443" -GLOBAL_AAI_USERNAME = "AAI" -GLOBAL_AAI_PASSWORD = "AAI" +GLOBAL_AAI_USERNAME = "aai@aai.onap.org" +GLOBAL_AAI_PASSWORD = "demo123456!" # appc info - everything is from the private oam network (also called onap private network) GLOBAL_APPC_SERVER_PROTOCOL = "http" GLOBAL_APPC_SERVER_PORT = "8282" -GLOBAL_APPC_SERVER = "http://appc.{{include "common.namespace" .}}:" GLOBAL_APPC_USERNAME = "admin" GLOBAL_APPC_PASSWORD = "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U" GLOBAL_APPC_CDT_SERVER_PROTOCOL = "http" GLOBAL_APPC_CDT_SERVER_PORT = "80" -GLOBAL_APPC_CDT_SERVER = "http://appc-cdt.{{include "common.namespace" .}}:" GLOBAL_APPC_CDT_USERNAME = "demo" # sdc info - everything is from the private oam network (also called onap private network) GLOBAL_ASDC_SERVER_PROTOCOL = "http" @@ -61,12 +59,12 @@ GLOBAL_DMAAP_DR_NODE_SERVER_PORT = "8080" GLOBAL_DROOLS_SERVER_PORT = "9696" GLOBAL_DROOLS_USERNAME = "@1b3rt" GLOBAL_DROOLS_PASSWORD = "31nst31n" -# Log info +# log server config - NOTE: no log server is run in HEAT; only on OOM GLOBAL_LOG_SERVER_PROTOCOL = "http" GLOBAL_LOG_ELASTICSEARCH_PORT = "9200" GLOBAL_LOG_LOGSTASH_PORT = "9600" GLOBAL_LOG_KIBANA_PORT = "5601" -# pomba info +# pomba info - NOTE: no pomba is run in HEAT; only on OOM GLOBAL_POMBA_SERVER_PROTOCOL = "http" GLOBAL_POMBA_AAICONTEXTBUILDER_PORT = "9530" GLOBAL_POMBA_SDCCONTEXTBUILDER_PORT = "9530" @@ -80,7 +78,7 @@ GLOBAL_MR_SERVER_PORT = "3904" # mso info - everything is from the private oam network (also called onap private network) GLOBAL_MSO_SERVER_PROTOCOL = "http" GLOBAL_MSO_SERVER_PORT = "8080" - +# SO containers GLOBAL_MSO_APIHAND_SERVER_PORT = "8080" GLOBAL_MSO_ASDCHAND_SERVER_PORT = "8085" GLOBAL_MSO_BPMN_SERVER_PORT = "8081" diff --git a/kubernetes/robot/templates/deployment.yaml b/kubernetes/robot/templates/deployment.yaml index 319ef59386..e50620f1d3 100644 --- a/kubernetes/robot/templates/deployment.yaml +++ b/kubernetes/robot/templates/deployment.yaml @@ -57,7 +57,7 @@ spec: - name: robot-logs mountPath: /share/logs resources: -{{ toYaml (pluck .Values.flavor .Values.resources| first) | indent 12 }} +{{ include "common.resources" . | indent 12 }} {{- if .Values.nodeSelector }} nodeSelector: {{ toYaml .Values.nodeSelector | indent 10 }} diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml index 146c0be941..4d320dde76 100755 --- a/kubernetes/robot/values.yaml +++ b/kubernetes/robot/values.yaml @@ -84,7 +84,7 @@ nodeSelector: {} affinity: {} -# Resource Limit flavor -By Default using small +# Resource Limit flavor -By Default using small flavor: small # Segregation for Different environment (Small and Large) resources: @@ -102,6 +102,7 @@ resources: requests: cpu: 1000m memory: 2Gi + unlimited: {} # probe configuration parameters liveness: |