diff options
| author |   Niharika Sharma <niharika.sharma@amdocs.com> | 2022-10-14 14:03:02 -0400 |
|---|---|---|
| committer |   Andreas Geissler <andreas-geissler@telekom.de> | 2022-11-24 09:22:31 +0000 |
| commit | 9a96ffdf8bc639f01e23649dd4e0864f7f276951 (patch) | |
| tree | 5fbdf8d11473f7c336cc035cbf00a6b85c539d11 | |
| parent | 99e46fbb376c2bb8a3968535c4c554ef56449d29 (diff) | |
[AAI] OOM AAI MODEL LOADER Fixed BabelClient
Added a new property to enable/disable http for AAI BabelClient/AAIRestClient
AAI model loader image updated
Issue-ID: AAI-3533
Signed-off-by: Niharika Sharma <niharika.sharma@amdocs.com>
Change-Id: I2b43ed691101c48eff19f5c4ddb1e0beb1073a7e
| -rw-r--r-- | kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties | 11 | ||||
| -rw-r--r-- | kubernetes/aai/components/aai-modelloader/values.yaml | 2 |
2 files changed, 11 insertions, 2 deletions
diff --git a/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties b/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties index 09eb397860..ab5dd95b21 100644 --- a/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties +++ b/kubernetes/aai/components/aai-modelloader/resources/config/model-loader.properties @@ -41,8 +41,10 @@ ml.distribution.MSG_BUS_ADDRESSES=message-router.{{.Release.Namespace}} ml.aai.BASE_URL=https://aai.{{.Release.Namespace}}:8443 ml.aai.KEYSTORE_FILE=aai-os-cert.p12 ml.aai.KEYSTORE_PASSWORD=OBF:1i9a1u2a1unz1lr61wn51wn11lss1unz1u301i6o +ml.aai.USE_HTTPS= true {{ else }} -ml.aai.BASE_URL=http://aai.{{.Release.Namespace}}:8080 +ml.aai.BASE_URL=http://aai.{{.Release.Namespace}}:80 +ml.aai.USE_HTTPS= false {{ end }} ml.aai.MODEL_URL=/aai/v*/service-design-and-creation/models/model/ ml.aai.NAMED_QUERY_URL=/aai/v*/service-design-and-creation/named-queries/named-query/ @@ -59,4 +61,11 @@ ml.babel.KEYSTORE_FILE=aaf/local/{{ .Values.certInitializer.fqi_namespace }}.p12 ml.babel.KEYSTORE_PASSWORD=${KEYSTORE_PASSWORD} ml.babel.TRUSTSTORE_FILE=aaf/local/{{ .Values.certInitializer.fqi_namespace }}.trust.jks ml.babel.TRUSTSTORE_PASSWORD=${TRUSTSTORE_PASSWORD} +ml.babel.USE_HTTPS= true +{{ else }} +ml.babel.KEYSTORE_FILE= +ml.babel.KEYSTORE_PASSWORD= +ml.babel.TRUSTSTORE_FILE= +ml.babel.TRUSTSTORE_PASSWORD= +ml.babel.USE_HTTPS= false {{ end }} diff --git a/kubernetes/aai/components/aai-modelloader/values.yaml b/kubernetes/aai/components/aai-modelloader/values.yaml index 3b7d79e4a3..ca5c74e929 100644 --- a/kubernetes/aai/components/aai-modelloader/values.yaml +++ b/kubernetes/aai/components/aai-modelloader/values.yaml @@ -56,7 +56,7 @@ certInitializer: chown -R {{ .Values.user_id }}:{{ .Values.group_id }} {{ .Values.credsPath }} # application image -image: onap/model-loader:1.9.4 +image: onap/model-loader:1.9.5 pullPolicy: Always restartPolicy: Always flavor: small |