AAF SMS is importing secrets in vault. CPS secret can be retrieved only
if cps is enabled.
this patch allows to disable CPS import in AAF SMS
Issue-ID: OOM-1
Signed-off-by: Sylvain Desbureaux <sylvain.desbureaux@orange.com>
Change-Id: Ib33d2fe05bb6e13fb6322138161a13cdfd2cf522
"UserName": "${OSDF_OPT_ENGINE_USER}",
"Password": "${OSDF_OPT_ENGINE_PASS}"
}
"UserName": "${OSDF_OPT_ENGINE_USER}",
"Password": "${OSDF_OPT_ENGINE_PASS}"
}
+ }{{ if .Values.cps.enabled }},
{
"name": "cps",
"values": {
"UserName": "${CPS_USER}",
"Password": "${CPS_PASS}"
}
{
"name": "cps",
"values": {
"UserName": "${CPS_USER}",
"Password": "${CPS_PASS}"
}
export OSDF_OPT_ENGINE_PASS=${OSDF_OPT_ENGINE_PASS_PLAIN};
export SO_PASS=${SO_PASS_PLAIN};
export SDC_PASS=${SDC_PASS_PLAIN};
export OSDF_OPT_ENGINE_PASS=${OSDF_OPT_ENGINE_PASS_PLAIN};
export SO_PASS=${SO_PASS_PLAIN};
export SDC_PASS=${SDC_PASS_PLAIN};
+ {{- if .Values.cps.enabled }}
export CPS_PASS=${CPS_PASS_PLAIN};
export CPS_PASS=${CPS_PASS_PLAIN};
cd /config-input;
for PFILE in `find . -not -type d | grep -v -F ..`; do
envsubst <${PFILE} >/config/${PFILE};
cd /config-input;
for PFILE in `find . -not -type d | grep -v -F ..`; do
envsubst <${PFILE} >/config/${PFILE};
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "sdc-creds" "key" "login") | indent 10 }}
- name: SDC_PASS_PLAIN
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "sdc-creds" "key" "password") | indent 10 }}
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "sdc-creds" "key" "login") | indent 10 }}
- name: SDC_PASS_PLAIN
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "sdc-creds" "key" "password") | indent 10 }}
+ {{- if .Values.cps.enabled }}
- name: CPS_USER
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cps-creds" "key" "login") | indent 10 }}
- name: CPS_PASS_PLAIN
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cps-creds" "key" "password") | indent 10 }}
- name: CPS_USER
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cps-creds" "key" "login") | indent 10 }}
- name: CPS_PASS_PLAIN
{{- include "common.secret.envFromSecretFast" (dict "global" . "uid" "cps-creds" "key" "password") | indent 10 }}
volumeMounts:
- mountPath: /config-input
volumeMounts:
- mountPath: /config-input
secrets:
- uid: aai-creds
type: basicAuth
secrets:
- uid: aai-creds
type: basicAuth
enabled: true
aaf:
enabled: true
enabled: true
aaf:
enabled: true
+ aaf-sms:
+ cps:
+ # you must always set the same values as value set in cps.enabled
+ enabled: true
replicaCount: 1
aaf:
enabled: false
replicaCount: 1
aaf:
enabled: false
+ aaf-sms:
+ cps:
+ # you must always set the same values as value set in cps.enabled
+ enabled: false
appc:
enabled: false
cassandra:
appc:
enabled: false
cassandra:
# Enable/disable and configure helm charts (ie. applications)
# to customize the ONAP deployment.
#################################################################
# Enable/disable and configure helm charts (ie. applications)
# to customize the ONAP deployment.
#################################################################
+ aaf-sms:
+ cps:
+ # you must always set the same values as value set in cps.enabled
+ enabled: false
aai:
enabled: false
appc:
aai:
enabled: false
appc: