summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kubernetes/aaf/components/aaf-sms/resources/config/osdf.json4
-rw-r--r--kubernetes/aaf/components/aaf-sms/templates/job.yaml5
-rw-r--r--kubernetes/aaf/components/aaf-sms/values.yaml3
-rw-r--r--kubernetes/onap/resources/overrides/onap-all.yaml4
-rw-r--r--kubernetes/onap/resources/overrides/sm-onap.yaml4
-rwxr-xr-xkubernetes/onap/values.yaml5
6 files changed, 22 insertions, 3 deletions
diff --git a/kubernetes/aaf/components/aaf-sms/resources/config/osdf.json b/kubernetes/aaf/components/aaf-sms/resources/config/osdf.json
index 3ede31dc44..c14f7ee4ba 100644
--- a/kubernetes/aaf/components/aaf-sms/resources/config/osdf.json
+++ b/kubernetes/aaf/components/aaf-sms/resources/config/osdf.json
@@ -99,14 +99,14 @@
"UserName": "${OSDF_OPT_ENGINE_USER}",
"Password": "${OSDF_OPT_ENGINE_PASS}"
}
- },
+ }{{ if .Values.cps.enabled }},
{
"name": "cps",
"values": {
"UserName": "${CPS_USER}",
"Password": "${CPS_PASS}"
}
- }
+ }{{ end }}
]
}
}
diff --git a/kubernetes/aaf/components/aaf-sms/templates/job.yaml b/kubernetes/aaf/components/aaf-sms/templates/job.yaml
index 6d9ecaa7cb..8dbe276d97 100644
--- a/kubernetes/aaf/components/aaf-sms/templates/job.yaml
+++ b/kubernetes/aaf/components/aaf-sms/templates/job.yaml
@@ -52,7 +52,9 @@ spec:
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};
+ {{- end }}
cd /config-input;
for PFILE in `find . -not -type d | grep -v -F ..`; do
envsubst <${PFILE} >/config/${PFILE};
@@ -137,11 +139,12 @@ spec:
{{- 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 }}
+ {{- end }}
volumeMounts:
- mountPath: /config-input
diff --git a/kubernetes/aaf/components/aaf-sms/values.yaml b/kubernetes/aaf/components/aaf-sms/values.yaml
index cde8529cc1..da268ccf06 100644
--- a/kubernetes/aaf/components/aaf-sms/values.yaml
+++ b/kubernetes/aaf/components/aaf-sms/values.yaml
@@ -116,6 +116,9 @@ persistence:
ingress:
enabled: false
+cps:
+ enabled: true
+
secrets:
- uid: aai-creds
type: basicAuth
diff --git a/kubernetes/onap/resources/overrides/onap-all.yaml b/kubernetes/onap/resources/overrides/onap-all.yaml
index 229717a990..f92bfa78bc 100644
--- a/kubernetes/onap/resources/overrides/onap-all.yaml
+++ b/kubernetes/onap/resources/overrides/onap-all.yaml
@@ -29,6 +29,10 @@ postgres:
enabled: true
aaf:
enabled: true
+ aaf-sms:
+ cps:
+ # you must always set the same values as value set in cps.enabled
+ enabled: true
aai:
enabled: true
appc:
diff --git a/kubernetes/onap/resources/overrides/sm-onap.yaml b/kubernetes/onap/resources/overrides/sm-onap.yaml
index 06ad5b7c9b..b07b6d3aa2 100644
--- a/kubernetes/onap/resources/overrides/sm-onap.yaml
+++ b/kubernetes/onap/resources/overrides/sm-onap.yaml
@@ -58,6 +58,10 @@ aai:
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:
diff --git a/kubernetes/onap/values.yaml b/kubernetes/onap/values.yaml
index 08f404a70c..83000afede 100755
--- a/kubernetes/onap/values.yaml
+++ b/kubernetes/onap/values.yaml
@@ -259,8 +259,13 @@ global:
# Enable/disable and configure helm charts (ie. applications)
# to customize the ONAP deployment.
#################################################################
+
aaf:
enabled: false
+ aaf-sms:
+ cps:
+ # you must always set the same values as value set in cps.enabled
+ enabled: false
aai:
enabled: false
appc: