summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
c22ceb9)
Also some changes for:
- optionally deploy postgres for dmaap-bc. Useful for quick dev deployments
- correct external host IP address for windriver AAF
Change-Id: I5fd74df4a0e5e3537d9573ed8d3f9b87da41689e
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-1138
- name: postgres
version: ~4.x-0
repository: '@local'
- name: postgres
version: ~4.x-0
repository: '@local'
# Settings for Soutbound API: Postgresql
#
#####################################################
# Settings for Soutbound API: Postgresql
#
#####################################################
-# flag indieonapdemodbates if we are using postgresql
-UsePGSQL: true
+# flag indicates if we are using postgresql
+UsePGSQL: {{ .Values.PG.enabled }}
# postgres host name
# Need to connect to PG primary service, designated by service.name2
# postgres host name
# Need to connect to PG primary service, designated by service.name2
-# Copyright © 2018 AT&T Intellectual Property. All rights reserved.
# Modifications Copyright © 2018 Amdocs,Bell Canada
#
# Licensed under the Apache License, Version 2.0 (the "License");
# Modifications Copyright © 2018 Amdocs,Bell Canada
#
# Licensed under the Apache License, Version 2.0 (the "License");
release: {{ .Release.Name }}
spec:
hostAliases:
release: {{ .Release.Name }}
spec:
hostAliases:
hostnames:
- "aaf-onap-test.osaaf.org"
initContainers:
hostnames:
- "aaf-onap-test.osaaf.org"
initContainers:
+ - command:
+ - /root/ready.py
+ args:
+ - --container-name
+ - aaf-locate
+ env:
+ - name: NAMESPACE
+ valueFrom:
+ fieldRef:
+ apiVersion: v1
+ fieldPath: metadata.namespace
+ image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
+ imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+ name: {{ include "common.name" . }}-aaf-readiness
+{{ if .Values.PG.enabled }}
- command:
- /root/ready.py
args:
- command:
- /root/ready.py
args:
fieldPath: metadata.namespace
image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
fieldPath: metadata.namespace
image: "{{ .Values.global.readinessRepository }}/{{ .Values.global.readinessImage }}"
imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
- name: {{ include "common.name" . }}-readiness
+ name: {{ include "common.name" . }}-postgres-readiness
+{{- end}}
containers:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
containers:
- name: {{ include "common.name" . }}
image: "{{ include "common.repository" . }}/{{ .Values.image }}"
# application configuration
dmaapMessageRouterService: message-router
# change the following value to point to Windriver instance maintained
# application configuration
dmaapMessageRouterService: message-router
# change the following value to point to Windriver instance maintained
# e.g.
#aafURL: https://aaf-onap-test.osaaf.org:8095/proxy/
aafURL: https://aaf-service:8100/
# e.g.
#aafURL: https://aaf-onap-test.osaaf.org:8095/proxy/
aafURL: https://aaf-service:8100/
-topicMgrUser: dmaap-bc-topic-mgr@dmaap-bc-topic-mgr.onap.org
+topicMgrUser: dmaap-bc@dmaap-bc.onap.org
topicMgrPwd: demo123456!
adminUser: aaf_admin@people.osaaf.org
adminPwd: demo123456!
topicMgrPwd: demo123456!
adminUser: aaf_admin@people.osaaf.org
adminPwd: demo123456!
# it will compose the topic namespace using the kubernetes namespace value
fixedTopicNamespace: true
# it will compose the topic namespace using the kubernetes namespace value
fixedTopicNamespace: true
+# for quicker deployments in dev, ability to disable using postgres
+PG:
+ enabled: true
+
nodeSelector: {}
affinity: {}
nodeSelector: {}
affinity: {}