diff options
| author |   Mandeep Khinda <Mandeep.Khinda@amdocs.com> | 2018-09-11 19:33:30 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-09-11 19:33:30 +0000 |
| commit | 610d64e935a09f30efb00ce9622147e4ffe758ba (patch) | |
| tree | b525b0eaf655f567f034ce564faec2f9d83b2936 /kubernetes/robot | |
| parent | ae397d001bf2b649397b6ca69aff881ffc6653fd (diff) | |
| parent | 6b1b02265a92e478ed9852b70a14ad8b6599425d (diff) | |
Merge "Update vm_properties.py for encrypted password"
Diffstat (limited to 'kubernetes/robot')
| -rw-r--r-- | kubernetes/robot/resources/config/eteshare/config/vm_properties.py | 2 | ||||
| -rw-r--r-- | kubernetes/robot/values.yaml | 5 |
2 files changed, 6 insertions, 1 deletions
diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py index 6a6ec3ed14..4ae8124126 100644 --- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py @@ -45,6 +45,7 @@ GLOBAL_INJECTED_OOF_IP_ADDR = "N/A" GLOBAL_INJECTED_OOF_HOMING_IP_ADDR = "oof-has-api.{{include "common.namespace" .}}" GLOBAL_INJECTED_OOF_SNIRO_IP_ADDR = "oof-osdf.{{include "common.namespace" .}}" GLOBAL_INJECTED_MSB_IP_ADDR = "msb-iag.{{include "common.namespace" .}}" +GLOBAL_INJECTED_OPENSTACK_API_KEY = "{{ .Values.config.openStackEncryptedPasswordHere}}" GLOBAL_INJECTED_OPENSTACK_PASSWORD = "{{ .Values.openStackPassword }}" GLOBAL_INJECTED_OPENSTACK_TENANT_ID = "{{ .Values.openStackTenantId }}" GLOBAL_INJECTED_OPENSTACK_USERNAME = "{{ .Values.openStackUserName }}" @@ -108,6 +109,7 @@ GLOBAL_INJECTED_PROPERTIES = { "GLOBAL_INJECTED_OOF_HOMING_IP_ADDR" : "oof-has-api.{{include "common.namespace" .}}", "GLOBAL_INJECTED_OOF_SNIRO_IP_ADDR" : "oof-osdf.{{include "common.namespace" .}}", "GLOBAL_INJECTED_MSB_IP_ADDR" : "msb-iag.{{include "common.namespace" .}}", + "GLOBAL_INJECTED_OPENSTACK_API_KEY" : "{{ .Values.config.openStackEncryptedPasswordHere}}", "GLOBAL_INJECTED_OPENSTACK_PASSWORD" : "{{ .Values.openStackPassword }}", "GLOBAL_INJECTED_OPENSTACK_TENANT_ID" : "{{ .Values.openStackTenantId }}", "GLOBAL_INJECTED_OPENSTACK_USERNAME" : "{{ .Values.openStackUserName }}", diff --git a/kubernetes/robot/values.yaml b/kubernetes/robot/values.yaml index 8a28e892f2..eccd684c0b 100644 --- a/kubernetes/robot/values.yaml +++ b/kubernetes/robot/values.yaml @@ -35,6 +35,9 @@ debugEnabled: false ################################################################# config: +# openStackEncryptedPasswordHere should match the encrypted string used in SO and APPC and overridden per environment + openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e" + # Demo configuration # Nexus demo artifact version. Maps to GLOBAL_INJECTED_ARTIFACTS_VERSION demoArtifactsVersion: "1.2.0-SNAPSHOT" @@ -147,4 +150,4 @@ persistence: accessMode: ReadWriteMany size: 2Gi mountPath: /dockerdata-nfs - mountSubPath: robot/logs
\ No newline at end of file + mountSubPath: robot/logs |