diff options
| author |   Alexis de Talhouët <adetalhouet89@gmail.com> | 2019-05-13 15:25:00 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-05-13 15:25:00 +0000 |
| commit | 4f897651438c1f8a199f471dd16b150585353116 (patch) | |
| tree | 3f643dbfb0257b0f613bb802a901f2d5558270d0 /kubernetes/dmaap | |
| parent | e2ba7c834a9f7f74227ff7733a673c1ba7fc4c15 (diff) | |
| parent | 837db9583cbfb6b650449f0fca6b08828caad2bf (diff) | |
Merge "Override aaf_locate_url from values.yaml"
Diffstat (limited to 'kubernetes/dmaap')
4 files changed, 36 insertions, 0 deletions
diff --git a/kubernetes/dmaap/components/dmaap-bc/resources/aaf/org.onap.dmaap-bc.props b/kubernetes/dmaap/components/dmaap-bc/resources/aaf/org.onap.dmaap-bc.props new file mode 100644 index 0000000000..3c29073e7a --- /dev/null +++ b/kubernetes/dmaap/components/dmaap-bc/resources/aaf/org.onap.dmaap-bc.props @@ -0,0 +1,15 @@ +############################################################ +# Properties Generated by AT&T Certificate Manager +# by root +# on 2019-03-22T17:37:33.690+0000 +# @copyright 2016, AT&T +############################################################ +aaf_env=DEV +aaf_id=dmaap-bc@dmaap-bc.onap.org +aaf_locate_url={{ .Values.aafLocateUrl }} +aaf_url=https://AAF_LOCATE_URL/AAF_NS.service:2.1 +cadi_etc_dir=/opt/app/osaaf/local +cadi_latitude=38.000 +cadi_longitude=-72.000 +cadi_prop_files=/opt/app/osaaf/local/org.onap.dmaap-bc.location.props:/opt/app/osaaf/local/org.onap.dmaap-bc.cred.props +cm_url=https://AAF_LOCATE_URL/%CNS.%AAF_NS.cm:2.1 diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml index 1066c946af..8ca07a353d 100644 --- a/kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml +++ b/kubernetes/dmaap/components/dmaap-bc/templates/configmap.yaml @@ -51,3 +51,16 @@ metadata: heritage: {{ .Release.Service }} data: {{ tpl (.Files.Glob "resources/dcaeLocations/*.json").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: {{ include "common.fullname" . }}-aaf-config + namespace: {{ include "common.namespace" . }} + labels: + app: {{ include "common.name" . }} + chart: {{ .Chart.Name }}-{{ .Chart.Version | replace "+" "_" }} + release: {{ .Release.Name }} + heritage: {{ .Release.Service }} +data: +{{ tpl (.Files.Glob "resources/aaf/*").AsConfig . | indent 2 }}
\ No newline at end of file diff --git a/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml b/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml index fb31454c63..fffd4db847 100644 --- a/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml +++ b/kubernetes/dmaap/components/dmaap-bc/templates/deployment.yaml @@ -97,6 +97,9 @@ spec: # since there may be more than one file in each mountPath - name: {{ include "common.name" . }}-config mountPath: /opt/app/config/conf/ + - name: {{ include "common.name" . }}-aaf-config + mountPath: /opt/app/dmaapbc/etc/org.onap.dmaap-bc.props + subPath: org.onap.dmaap-bc.props resources: {{ include "common.resources" . | indent 12 }} @@ -115,5 +118,8 @@ spec: - name: {{ include "common.name" . }}-config configMap: name: {{ include "common.fullname" . }}-config + - name: {{ include "common.name" . }}-aaf-config + configMap: + name: {{ include "common.fullname" . }}-aaf-config imagePullSecrets: - name: "{{ include "common.namespace" . }}-docker-registry-key" diff --git a/kubernetes/dmaap/components/dmaap-bc/values.yaml b/kubernetes/dmaap/components/dmaap-bc/values.yaml index 6b974141d0..171ac45788 100644 --- a/kubernetes/dmaap/components/dmaap-bc/values.yaml +++ b/kubernetes/dmaap/components/dmaap-bc/values.yaml @@ -35,11 +35,13 @@ image: onap/dmaap/dmaap-bc:1.1.5 # application configuration dmaapMessageRouterService: message-router + # change the following value to point to Windriver instance maintained # by AAF team. # e.g. #aafURL: https://aaf-onap-test.osaaf.org:8095/proxy/ aafURL: https://aaf-service:8100/ +aafLocateUrl: https://aaf-locate:8095 topicMgrUser: dmaap-bc@dmaap-bc.onap.org topicMgrPwd: demo123456! adminUser: aaf_admin@people.osaaf.org |