diff options
| author |   Jack Lucas <jflos@sonoris.net> | 2022-01-31 14:59:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2022-01-31 14:59:24 +0000 |
| commit | 0eec968ce240c0f029de5c3d3f8b3e8037ee74ce (patch) | |
| tree | 44ed2213ea1877c2da51b2698ff9a00d5cc78147 /kubernetes/sdc/resources/config/environments | |
| parent | 85a13b2a91f3ba076a8ce28d9d7877354c6c0439 (diff) | |
| parent | 2b764d035310d91744b4c22ace83593b9a561116 (diff) | |
Merge "[SDC] Service Mesh Compliance for SDC"
Diffstat (limited to 'kubernetes/sdc/resources/config/environments')
| -rwxr-xr-x | kubernetes/sdc/resources/config/environments/AUTO.json | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/kubernetes/sdc/resources/config/environments/AUTO.json b/kubernetes/sdc/resources/config/environments/AUTO.json index 3b03205ffc..c9535592d8 100755 --- a/kubernetes/sdc/resources/config/environments/AUTO.json +++ b/kubernetes/sdc/resources/config/environments/AUTO.json @@ -8,7 +8,7 @@ "chef_type": "environment", "default_attributes": { - "disableHttp": {{ .Values.global.security.disableHttp }}, + "disableHttp": {{ (eq "true" (include "common.needTLS" .)) | ternary "true" "false" }}, "CS_VIP": "{{.Values.global.sdc_cassandra.serviceName}}.{{include "common.namespace" .}}", "BE_VIP": "sdc-be.{{include "common.namespace" .}}", "ONBOARDING_BE_VIP": "sdc-onboarding-be.{{include "common.namespace" .}}", @@ -112,11 +112,13 @@ "username": "user1@sdc.com", "password": "password==" } + {{- if .Values.global.aafEnabled }} }, "jetty": { "keystore_pwd": "${KEYSTORE_PASS}", "truststore_pwd": "${TRUSTSTORE_PASS}", "keymanager_pwd": "${KEYMANAGER_PASS}" + {{- end }} } } } |