diff options
| author |   Brian Freeman <bf1936@att.com> | 2018-09-10 07:53:22 -0500 |
|---|---|---|
| committer | Brian Freeman <bf1936@att.com> | 2018-09-10 15:42:27 -0500 |
| commit | 6b1b02265a92e478ed9852b70a14ad8b6599425d (patch) | |
| tree | 58cb9e6c25c849d882a32076041a3350fb9309d8 | |
| parent | 3d8b63bc8475e3a1485fc247e7cc2cf9f9cf6fba (diff) | |
Update vm_properties.py for encrypted password
Issue-ID: INT-515
Change-Id: I11824c0e3424f153c413a2bee547423be80338a7
Signed-off-by: Brian Freeman <bf1936@att.com>
| -rw-r--r-- | kubernetes/onap/values.yaml | 3 | ||||
| -rw-r--r-- | kubernetes/robot/resources/config/eteshare/config/vm_properties.py | 2 | ||||
| -rw-r--r-- | kubernetes/robot/values.yaml | 5 |
3 files changed, 9 insertions, 1 deletions
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml index bc256a21ba..4d3707033f 100644 --- a/kubernetes/onap/values.yaml +++ b/kubernetes/onap/values.yaml @@ -108,6 +108,9 @@ portal: enabled: true robot: enabled: true + config: +# openStackEncryptedPasswordHere should match the encrypted string used in SO and APPC and overridden per environment + openStackEncryptedPasswordHere: "c124921a3a0efbe579782cde8227681e" sdc: enabled: true sdnc: 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 |