diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2018-03-27 00:29:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-03-27 00:29:20 +0000 |
| commit | 4e4b97524ca8731bbb2b3080ca85b139f0096ce5 (patch) | |
| tree | f350b597e75f012c5d6b73d726db8575bfb20c60 | |
| parent | 3a64af538d2b8d86fd758da9b2a3358de9b90d7a (diff) | |
| parent | 5902d4b627a7feea1ee85b7e436220c13219a6d5 (diff) | |
Merge "Script_version addiition in robot config"
| -rwxr-xr-x | kubernetes/robot/resources/config/eteshare/config/vm_properties.py | 6 | ||||
| -rw-r--r-- | kubernetes/robot/values.yaml | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py index 41db84d2b9..cd1ce14dc8 100755 --- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py @@ -1,4 +1,4 @@ -# File generated from /opt/config +#file generated from /opt/config # GLOBAL_INJECTED_AAI1_IP_ADDR = "{{.Release.Name}}-aai.{{include "common.namespace" .}}" GLOBAL_INJECTED_AAI2_IP_ADDR = "N/A" @@ -38,6 +38,7 @@ GLOBAL_INJECTED_VID_IP_ADDR = "{{.Release.Name}}-vid-server.{{include "common.na GLOBAL_INJECTED_VM_FLAVOR = "{{ .Values.openStackFlavourMedium }}" GLOBAL_INJECTED_VM_IMAGE_NAME = "{{ .Values.ubuntuImage }}" GLOBAL_INJECTED_PUBLIC_NET_ID = "{{ .Values.openStackPublicNetId }}" +GLOBAL_INJECTED_SCRIPT_VERSION = "{{ .Values.scriptVersion }}" GLOBAL_INJECTED_PROPERTIES = { "GLOBAL_INJECTED_AAI1_IP_ADDR" : "{{.Release.Name}}-aai.{{include "common.namespace" .}}", "GLOBAL_INJECTED_APPC_IP_ADDR" : "{{.Release.Name}}-appc-sdnhost.{{include "common.namespace" .}}", @@ -73,5 +74,6 @@ GLOBAL_INJECTED_PROPERTIES = { "GLOBAL_INJECTED_VID_IP_ADDR" : "{{.Release.Name}}-vid-server.{{include "common.namespace" .}}", "GLOBAL_INJECTED_VM_FLAVOR" : "{{ .Values.openStackFlavourMedium }}", "GLOBAL_INJECTED_VM_IMAGE_NAME" : "{{ .Values.ubuntuImage }}", - "GLOBAL_INJECTED_PUBLIC_NET_ID" : "{{ .Values.openStackPublicNetId }}" + "GLOBAL_INJECTED_PUBLIC_NET_ID" : "{{ .Values.openStackPublicNetId }}", + "GLOBAL_INJECTED_SCRIPT_VERSION" : "{{ .Values.scriptVersion }}" } diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml index 9057a86aff..6ef3a21d89 100644 --- a/kubernetes/robot/values.yaml +++ b/kubernetes/robot/values.yaml @@ -46,6 +46,7 @@ openStackPrivateSubnetId: "e8f51956-00dd-4425-af36-045716781ffc" openStackTenantId: "47899782ed714295b1151681fdfd51f5" openStackUserName: "vnf_user" ubuntuImage: "Ubuntu_14.04.5_LTS" +scriptVersion: "1.1.1" # default number of instances robotReplicas: 1 |