X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=auth%2Fhelm%2Faaf%2Ftemplates%2Faaf-cass.yaml;h=ace2181732f88acb4400c3561dedb8f27c03fbc4;hb=HEAD;hp=e8d91e2c92525f9a8d38fb65b45abb7070c3ce51;hpb=944be36dc15900cc9b3a8cf04916f5ef446824c6;p=aaf%2Fauthz.git

diff --git a/auth/helm/aaf/templates/aaf-cass.yaml b/auth/helm/aaf/templates/aaf-cass.yaml
index e8d91e2c..ace21817 100644
--- a/auth/helm/aaf/templates/aaf-cass.yaml
+++ b/auth/helm/aaf/templates/aaf-cass.yaml
@@ -1,23 +1,49 @@
+#########
+##  ============LICENSE_START====================================================
+##  org.onap.aaf
+##  ===========================================================================
+##  Copyright (c) 2017 AT&T Intellectual Property. All rights reserved.
+##  ===========================================================================
+##  Licensed under the Apache License, Version 2.0 (the "License");
+##  you may not use this file except in compliance with the License.
+##  You may obtain a copy of the License at
+##
+##       http://www.apache.org/licenses/LICENSE-2.0
+##
+##  Unless required by applicable law or agreed to in writing, software
+##  distributed under the License is distributed on an "AS IS" BASIS,
+##  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+##  See the License for the specific language governing permissions and
+##  limitations under the License.
+##  ============LICENSE_END====================================================
+##
+
 kind: Service
 apiVersion: v1
 metadata:
   name: aaf-cass
+  labels:
+    app: aaf-cass
 spec:
   selector:
     app: aaf-cass
   ports:
     - name: storage
       protocol: TCP
-      port: 7000
-      containerPort: 7000
+      port: {{.Values.services.cass.storage_port}}
+      containerPort: {{.Values.services.cass.storage_port}}
     - name: ssl-storage
       protocol: TCP
-      port: 7001
-      containerPort: 7001
+      port: {{.Values.services.cass.ssl_storage_port}}
+      containerPort: {{.Values.services.cass.ssl_storage_port}}
     - name: native-trans
       protocol: TCP
-      port: 9042
-      containerPort: 9042
+      port: {{.Values.services.cass.native_trans_port}}
+      containerPort: {{.Values.services.cass.native_trans_port}}
+    - name: rpc
+      protocol: TCP
+      port: {{.Values.services.cass.rpc_port}}
+      containerPort: {{.Values.services.cass.rpc_port}}
 ---
 apiVersion: apps/v1
 kind: Deployment
@@ -26,7 +52,7 @@ metadata:
   labels:
     app: aaf-cass
 spec:
-  replicas: 1
+  replicas: {{ .Values.services.cass.replicas }}
   selector:
     matchLabels:
       app: aaf-cass
@@ -36,36 +62,72 @@ spec:
         app: aaf-cass
     spec:
       volumes:
-      - name: {{ .Chart.Name }}-cass-vol
+      - name: aaf-cass-vol
+        persistentVolumeClaim:
+          claimName: aaf-cass-pvc
+      - name: aaf-status-vol
         persistentVolumeClaim:
-          claimName: {{ .Chart.Name }}-cass-pvc
+          claimName: aaf-status-pvc
+      initContainers:
+        - command:
+            - /bin/sh
+            - -c
+            - |
+              chmod -R 775 /opt/app/aaf/status
+              chown -R 1000:1000 /opt/app/aaf/status
+              chmod -R 775 /var/lib/cassandra
+              chown -R 1000:1000 /var/lib/cassandra
+          image: busybox:1.28
+          imagePullPolicy: {{ .Values.global.pullPolicy | default .Values.pullPolicy }}
+          name: init-sysctl
+          volumeMounts:
+            - mountPath: /opt/app/aaf/status
+              name: aaf-status-vol
+            - mountPath: /var/lib/cassandra
+              name: aaf-cass-vol
       containers:
 ###
 ### AAF-CASS
 ###
-      - name: {{ .Chart.Name }}-cass
+      - name: aaf-cass
         image: {{ .Values.image.repository }}onap/aaf/aaf_cass:{{ .Values.image.version }}
         imagePullPolicy: IfNotPresent
         # installing with cmd "onap" will not only initialize the DB, but add ONAP bootstrap data as well
         command: ["/bin/bash","/opt/app/aaf/cass_init/cmd.sh","onap"]
+        lifecycle:
+          preStop:
+            exec:
+              command: ["/bin/sh","-c","rm /opt/app/aaf/status/aaf-cass"]
         volumeMounts:
-          - mountPath: "/var/lib/cassandra"
-            name: {{ .Chart.Name }}-cass-vol
+        - mountPath: "/var/lib/cassandra"
+          name: aaf-cass-vol
+        - mountPath: "/opt/app/aaf/status"
+          name: aaf-status-vol
         ports:
         - name: storage
-          containerPort: 7000
+          containerPort: {{.Values.services.cass.storage_port}}
         - name: ssl-storage
-          containerPort: 7001
+          containerPort: {{.Values.services.cass.storage_port}}
         - name: native-trans
-          containerPort: 9042
+          containerPort: {{.Values.services.cass.native_trans_port}}
         - name: rpc
-          containerPort: 9160
+          containerPort: {{.Values.services.cass.rpc_port}}
         env:
         - name: CASSANDRA_CLUSTER_NAME
-          value: "osaaf"
+          value: {{.Values.services.cass.cluster_name}}
         - name: CASSANDRA_DC
-          value: "dc1"
+          value: {{.Values.services.cass.dc}}
         - name: HEAP_NEWSIZE
-          value: "512M"
+          value: {{.Values.services.cass.heap_new_size}}
         - name: MAX_HEAP_SIZE
-          value: "1024M"
+          value: {{.Values.services.cass.max_heap_size}}
+        - name: MY_POD_NAME
+          valueFrom:
+            fieldRef:
+              fieldPath: metadata.name
+        - name: MY_POD_NAMESPACE
+          value: {{ .Release.Namespace }}
+        - name: MY_POD_IP
+          valueFrom:
+            fieldRef:
+              fieldPath: status.podIP