diff options
| author |   Alexis de Talhouët <alexis.de_talhouet@bell.ca> | 2018-02-09 14:50:16 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-02-09 14:50:16 +0000 |
| commit | f2131185e18ba27c0ca686914b8b8ae2bd8fe75e (patch) | |
| tree | 923aad640ee329c4ca71709f2062f71370ab182b | |
| parent | 4e5976499f610abb40e9bf77dca31c5fc16b7a65 (diff) | |
| parent | ab42e77a354d25f00a53f4db7ffb7780a7e2c774 (diff) | |
Merge "aai resources and traversal config alignment"
| -rw-r--r-- | resources/config/log/resources/logback.xml (renamed from resources/resources/conf/logback.xml) | 0 | ||||
| -rw-r--r-- | resources/config/log/traversal/logback.xml (renamed from resources/traversal/conf/logback.xml) | 0 | ||||
| -rw-r--r-- | templates/aai-resources-deployment.yaml | 10 | ||||
| -rw-r--r-- | templates/aai-resources-traversal-configmap.yaml | 16 | ||||
| -rw-r--r-- | templates/aai-traversal-deployment.yaml | 10 |
5 files changed, 18 insertions, 18 deletions
diff --git a/resources/resources/conf/logback.xml b/resources/config/log/resources/logback.xml index 6cfc293..6cfc293 100644 --- a/resources/resources/conf/logback.xml +++ b/resources/config/log/resources/logback.xml diff --git a/resources/traversal/conf/logback.xml b/resources/config/log/traversal/logback.xml index fb8d8a5..fb8d8a5 100644 --- a/resources/traversal/conf/logback.xml +++ b/resources/config/log/traversal/logback.xml diff --git a/templates/aai-resources-deployment.yaml b/templates/aai-resources-deployment.yaml index 5ca0c16..2e0b049 100644 --- a/templates/aai-resources-deployment.yaml +++ b/templates/aai-resources-deployment.yaml @@ -97,16 +97,8 @@ spec: emptyDir: {} - name: aai-resources-log-conf configMap: - name: aai-resources-configmap + name: aai-resources-log-configmap restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: aai-resources-configmap - namespace: {{ .Values.nsPrefix }}-aai -data: -{{ (.Files.Glob "resources/resources/conf/logback.xml").AsConfig | indent 2 }} #{{ end }} diff --git a/templates/aai-resources-traversal-configmap.yaml b/templates/aai-resources-traversal-configmap.yaml index 772c3a7..ebd6913 100644 --- a/templates/aai-resources-traversal-configmap.yaml +++ b/templates/aai-resources-traversal-configmap.yaml @@ -14,4 +14,20 @@ metadata: namespace: {{ .Values.nsPrefix }}-aai data: {{ tpl (.Files.Glob "resources/config/aai-data/environments/*").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: aai-resources-log-configmap + namespace: {{ .Values.nsPrefix }}-aai +data: +{{ tpl (.Files.Glob "resources/config/log/resources/logback.xml").AsConfig . | indent 2 }} +--- +apiVersion: v1 +kind: ConfigMap +metadata: + name: aai-traversal-log-configmap + namespace: {{ .Values.nsPrefix }}-aai +data: +{{ tpl (.Files.Glob "resources/config/log/traversal/logback.xml").AsConfig . | indent 2 }} #{{ end }} diff --git a/templates/aai-traversal-deployment.yaml b/templates/aai-traversal-deployment.yaml index fda0055..a61a83e 100644 --- a/templates/aai-traversal-deployment.yaml +++ b/templates/aai-traversal-deployment.yaml @@ -99,16 +99,8 @@ spec: emptyDir: {} - name: aai-traversal-log-conf configMap: - name: aai-traversal-configmap + name: aai-traversal-log-configmap restartPolicy: Always imagePullSecrets: - name: "{{ .Values.nsPrefix }}-docker-registry-key" ---- -apiVersion: v1 -kind: ConfigMap -metadata: - name: aai-traversal-configmap - namespace: {{ .Values.nsPrefix }}-aai -data: -{{ (.Files.Glob "resources/traversal/conf/logback.xml").AsConfig | indent 2 }} #{{ end }} |