diff options
author | Dominic Lunanuova <dgl@research.att.com> | 2018-04-12 14:40:34 +0000 |
---|---|---|
committer | Mandeep Khinda <mandeep.khinda@amdocs.com> | 2018-04-30 14:14:58 +0000 |
commit | e825feeadf1aae047371ebc5c6113be1f7ec464e (patch) | |
tree | aa9a26e353587498c15307b374cb6c699caa0053 /kubernetes/dmaap/resources | |
parent | 615f9490a7d99ab1345f72645f1816a70e2753ea (diff) |
Integration w common/postgres
Patchset 1: first cut at integration with common/postgres
Patchset 2: Mandeep Khinda - refactored charts to standardize
Wired in shared postgres chart
Patchset 6: Introduced simple dmaap/Makefile to force
helm dep up in the deeper charts directory.
Includes slight modification to parent make clean target
Patchset 8: merge conflict again
Change-Id: If59f08638bac8761ae5452b60f172c99fcf4ec86
Signed-off-by: Dominic Lunanuova <dgl@research.att.com>
Issue-ID: DMAAP-117
Signed-off-by: Dominic Lunanuova <dgl@research.att.com>
Diffstat (limited to 'kubernetes/dmaap/resources')
-rw-r--r-- | kubernetes/dmaap/resources/config/README.txt | 10 | ||||
-rw-r--r-- | kubernetes/dmaap/resources/config/application.properties | 1 | ||||
-rw-r--r-- | kubernetes/dmaap/resources/config/buscontroller.env | 12 |
3 files changed, 0 insertions, 23 deletions
diff --git a/kubernetes/dmaap/resources/config/README.txt b/kubernetes/dmaap/resources/config/README.txt deleted file mode 100644 index 5cc01497f5..0000000000 --- a/kubernetes/dmaap/resources/config/README.txt +++ /dev/null @@ -1,10 +0,0 @@ -This directory contains all external configuration files that -need to be mounted into an application container. - -See the configmap.yaml in the templates directory for an example -of how to load (ie map) config files from this directory, into -Kubernetes, for distribution within the k8s cluster. - -See deployment.yaml in the templates directory for an example -of how the 'config mapped' files are then mounted into the -containers. diff --git a/kubernetes/dmaap/resources/config/application.properties b/kubernetes/dmaap/resources/config/application.properties deleted file mode 100644 index 496a15a531..0000000000 --- a/kubernetes/dmaap/resources/config/application.properties +++ /dev/null @@ -1 +0,0 @@ -sampleConfigKey=sampleConfigValue
\ No newline at end of file diff --git a/kubernetes/dmaap/resources/config/buscontroller.env b/kubernetes/dmaap/resources/config/buscontroller.env deleted file mode 100644 index 74d7822faa..0000000000 --- a/kubernetes/dmaap/resources/config/buscontroller.env +++ /dev/null @@ -1,12 +0,0 @@ -DMAAPBC_PG_ENABLED=true -DMAAPBC_PGHOST=dmaap-prov-postgresql -DMAAPBC_PGDBNAME={{ .Values.global.postgresDatabase }} -DMAAPBC_PGCRED={{ .Values.global.postgresPassword }} -DMAAPBC_PGUSER={{ .Values.global.postgresUser }} -DMAAPBC_MR_CNAME={{ .Values.dmaapMessageRouterService }} -DMAAPBC_AAF_URL={{ .Values.aafURL }} -DMAAPBC_TOPICMGR_USER={{ .Values.topicMgrUser }} -DMAAPBC_TOPICMGR_PWD={{ .Values.topicMgrPwd }} -DMAAPBC_ADMIN_USER={{ .Values.adminUser }} -DMAAPBC_ADMIN_PWD={{ .Values.adminPwd }} - |