Update AAI to latest v1.1.1

[oom.git] / kubernetes / aai / templates / aai-traversal-deployment.yaml

diff --git a/kubernetes/aai/templates/aai-traversal-deployment.yaml b/kubernetes/aai/templates/aai-traversal-deployment.yaml
index 87861b4..4fc4d7f 100644 (file)
--- a/kubernetes/aai/templates/aai-traversal-deployment.yaml
+++ b/kubernetes/aai/templates/aai-traversal-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAaiAaiTraversal }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -47,19 +48,17 @@ spec:
         imagePullPolicy: {{ .Values.pullPolicy }}
         env:
         - name: CHEF_BRANCH
-          value: master
+          value: amsterdam
         - name: AAI_CHEF_ENV
           value: simpledemo
         - name: AAI_CORE_VERSION
-          value: 1.1.0-SNAPSHOT
+          value: 1.1.1-SNAPSHOT
         - name: AAI_CHEF_LOC
           value: /var/chef/aai-data/environments
         - name: CHEF_GIT_URL
           value: http://gerrit.onap.org/r/aai
         - name: RESOURCES_HOSTNAME
           value: aai-resources.{{ .Values.nsPrefix }}-aai
-        - name: LOCAL_USER_ID
-          value: "0"
         volumeMounts:
         - mountPath: /etc/localtime
           name: localtime
@@ -97,7 +96,7 @@ spec:
           path: "/dockerdata-nfs/{{ .Values.nsPrefix }}/aai/aai-data/"
       - name: filebeat-conf
         hostPath:
-          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+          path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/logback/filebeat.yml
       - name: aai-traversal-logs
         emptyDir: {}
       - name: aai-traversal-filebeat
@@ -116,4 +115,4 @@ metadata:
   namespace: {{ .Values.nsPrefix }}-aai
 data:
 {{ (.Files.Glob "resources/traversal/conf/logback.xml").AsConfig | indent 2 }}
-
+#{{ end }}