diff options
| author |   efiacor <fiachra.corcoran@est.tech> | 2020-02-05 20:42:47 +0000 |
|---|---|---|
| committer | efiacor <fiachra.corcoran@est.tech> | 2020-02-05 20:42:54 +0000 |
| commit | 0ccdd6c9f20793ae46d0b39650d314e01ddec908 (patch) | |
| tree | 8707a30534b6a5056fa215d8d4d43345a1f65fd9 | |
| parent | 00fd764cb5bdfd020e05a2391639857f6181f0cb (diff) | |
Removing pass_enc_key from DMaaP prov props
# Also adding AAF ready check for dr-node
Change-Id: I7e6fc29a7f5607cc168f9fd61642a40a9185c55b
Signed-off-by: efiacor <fiachra.corcoran@est.tech>
Issue-ID: DMAAP-1367
| -rw-r--r-- | kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml | 14 | ||||
| -rw-r--r-- | kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties | 1 |
2 files changed, 14 insertions, 1 deletions
diff --git a/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml b/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml index edb3a2a759..4cd2ab56b5 100644 --- a/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml +++ b/kubernetes/dmaap/components/dmaap-dr-node/templates/statefulset.yaml @@ -46,6 +46,20 @@ spec: apiVersion: v1 fieldPath: metadata.namespace {{- if .Values.global.aafEnabled }} + - name: {{ include "common.name" . }}-aaf-readiness + image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}" + imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} + command: + - /root/ready.py + args: + - --container-name + - aaf-locate + env: + - name: NAMESPACE + valueFrom: + fieldRef: + apiVersion: v1 + fieldPath: metadata.namespace - name: {{ include "common.name" . }}-dr-node-aaf-config image: "{{ include "common.repository" . }}/{{ .Values.global.aafAgentImage }}" imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }} diff --git a/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties b/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties index c7714d33a4..34662ae9e3 100644 --- a/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties +++ b/kubernetes/dmaap/components/dmaap-dr-prov/resources/config/provserver.properties @@ -50,7 +50,6 @@ org.onap.dmaap.datarouter.provserver.https.include.protocols = TLSv1.1|TLSv1.2 # AAF config org.onap.dmaap.datarouter.provserver.cadi.enabled = false -org.onap.dmaap.datarouter.provserver.passwordencryption = PasswordEncryptionKey#@$%^&1234# org.onap.dmaap.datarouter.provserver.aaf.feed.type = org.onap.dmaap-dr.feed org.onap.dmaap.datarouter.provserver.aaf.sub.type = org.onap.dmaap-dr.sub org.onap.dmaap.datarouter.provserver.aaf.instance = legacy |