X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=kubernetes%2Fappc%2Ftemplates%2Fappc-deployment.yaml;h=f4593b0d7303824f3c3ced35be0555c09c31119c;hb=a6eb9be0e091746c824b169a46242ef0943a2b05;hp=8046107243a6d94679fc7b88ed720270c92b1262;hpb=1f11885db780da4b4fcfe91d5456d1235a0e9dd8;p=oom.git

diff --git a/kubernetes/appc/templates/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml
index 8046107243..f4593b0d73 100644
--- a/kubernetes/appc/templates/appc-deployment.yaml
+++ b/kubernetes/appc/templates/appc-deployment.yaml
@@ -1,3 +1,4 @@
+#{{ if not .Values.disableAppcAppc }}
 apiVersion: extensions/v1beta1
 kind: Deployment
 metadata:
@@ -12,33 +13,22 @@ spec:
       labels:
         app: appc
       name: appc
-      annotations:
-        pod.beta.kubernetes.io/init-containers: '[
-          {
-              "args": [
-                  "--container-name",
-                  "appc-db-container"
-              ],
-              "command": [
-                  "/root/ready.py"
-              ],
-              "env": [
-                  {
-                      "name": "NAMESPACE",
-                      "valueFrom": {
-                          "fieldRef": {
-                              "apiVersion": "v1",
-                              "fieldPath": "metadata.namespace"
-                          }
-                      }
-                  }
-              ],
-              "image": "{{ .Values.image.readiness }}",
-              "imagePullPolicy": "{{ .Values.pullPolicy }}",
-              "name": "appc-readiness"
-          }
-          ]'
     spec:
+      initContainers:
+      - command:
+        - /root/ready.py
+        args:
+        - --container-name
+        - appc-db-container
+        env:
+        - name: NAMESPACE
+          valueFrom:
+            fieldRef:
+              apiVersion: v1
+              fieldPath: metadata.namespace
+        image: {{ .Values.image.readiness }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: appc-readiness
       containers:
       - command:
         - /opt/openecomp/appc/bin/startODL.sh
@@ -46,7 +36,7 @@ spec:
         - name: MYSQL_ROOT_PASSWORD
           value: openECOMP1.0
         - name: SDNC_CONFIG_DIR
-          value: /opt/openecomp/sdnc/data/properties
+          value: /opt/openecomp/appc/data/properties
         - name: APPC_CONFIG_DIR
           value: /opt/openecomp/appc/data/properties
         - name: DMAAP_TOPIC_ENV
@@ -62,10 +52,12 @@ spec:
           name: appc-properties
         - mountPath: /opt/openecomp/appc/data/properties/aaiclient.properties
           name: appc-aaiclient-properties
-        - mountPath: /opt/openecomp/sdnc/data/properties/aaiclient.properties
+        - mountPath: /opt/onap/sdnc/data/properties/aaiclient.properties
           name: sdnc-aaiclient-properties
-        - mountPath: /opt/openecomp/sdnc/data/properties/admportal.json
-          name: sdnc-admportal-json
+        - mountPath: /var/log/onap
+          name: appc-logs
+        - mountPath: /opt/opendaylight/current/etc/org.ops4j.pax.logging.cfg
+          name: appc-log-config
         ports:
         - containerPort: 8181
         - containerPort: 1830
@@ -74,10 +66,30 @@ spec:
             port: 8181
           initialDelaySeconds: 5
           periodSeconds: 10
+      - image: {{ .Values.image.filebeat }}
+        imagePullPolicy: {{ .Values.pullPolicy }}
+        name: filebeat-onap
+        volumeMounts:
+        - mountPath: /usr/share/filebeat/filebeat.yml
+          name: filebeat-conf
+        - mountPath: /var/log/onap
+          name: appc-logs
+        - mountPath: /usr/share/filebeat/data
+          name: appc-data-filebeat
       volumes:
         - name: localtime
           hostPath:
             path: /etc/localtime
+        - name: filebeat-conf
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/filebeat/log4j/filebeat.yml
+        - name: appc-log-config
+          hostPath:
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/log/appc/org.ops4j.pax.logging.cfg
+        - name: appc-logs
+          emptyDir: {}
+        - name: appc-data-filebeat
+          emptyDir: {}
         - name: appc-properties
           hostPath:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/conf/appc.properties
@@ -87,8 +99,6 @@ spec:
         - name: sdnc-aaiclient-properties
           hostPath:
             path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/aaiclient.properties
-        - name: sdnc-admportal-json
-          hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf/admportal.json
       imagePullSecrets:
       - name: "{{ .Values.nsPrefix }}-docker-registry-key"
+#{{ end }}