From 9f354818ca418f86d42bf549613e46b66ebdc323 Mon Sep 17 00:00:00 2001
From: Mandeep Khinda <mandeep.khinda@amdocs.com>
Date: Fri, 25 Aug 2017 16:18:28 +0000
Subject: moving appc & sdnc to 1.1

-Updated forked config files.
--Had to change from mounting whole dir to specific files
as we were overwriting other files from the image!

Issue-ID:OOM-66
Issue-ID:OOM-160

Change-Id: Id6d5394e279fcbdbbaffc8f48067e73a7c99c1c9
Signed-off-by: Mandeep Khinda <mandeep.khinda@amdocs.com>
---
 kubernetes/appc/templates/appc-deployment.yaml | 26 ++++++++++++++++++--------
 kubernetes/appc/values.yaml                    |  4 ++--
 2 files changed, 20 insertions(+), 10 deletions(-)

(limited to 'kubernetes/appc')

diff --git a/kubernetes/appc/templates/appc-deployment.yaml b/kubernetes/appc/templates/appc-deployment.yaml
index 049ac5d457..8be421cbf9 100644
--- a/kubernetes/appc/templates/appc-deployment.yaml
+++ b/kubernetes/appc/templates/appc-deployment.yaml
@@ -55,10 +55,14 @@ spec:
         imagePullPolicy: {{ .Values.pullPolicy }}
         name: appc-controller-container
         volumeMounts:
-        - mountPath: /opt/openecomp/appc/data/properties
-          name: appc-conf
-        - mountPath: /opt/openecomp/sdnc/data/properties
-          name: sdnc-conf
+        - mountPath: /opt/openecomp/appc/data/properties/appc.properties
+          name: appc-properties
+        - mountPath: /opt/openecomp/appc/data/properties/aaiclient.properties
+          name: appc-aaiclient-properties
+        - mountPath: /opt/openecomp/sdnc/data/properties/aaiclient.properties
+          name: sdnc-aaiclient-properties
+        - mountPath: /opt/openecomp/sdnc/data/properties/admportal.json
+          name: sdnc-admportal-json
         ports:
         - containerPort: 8181
         - containerPort: 1830
@@ -68,11 +72,17 @@ spec:
           initialDelaySeconds: 5
           periodSeconds: 10
       volumes:
-        - name: appc-conf
+        - name: appc-properties
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/conf
-        - name: sdnc-conf
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/conf/appc.properties
+        - name: appc-aaiclient-properties
           hostPath:
-            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/sdnc/conf
+            path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/conf/aaiclient.properties
+        - 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"
diff --git a/kubernetes/appc/values.yaml b/kubernetes/appc/values.yaml
index fd73fc1618..74b189f371 100644
--- a/kubernetes/appc/values.yaml
+++ b/kubernetes/appc/values.yaml
@@ -2,6 +2,6 @@ nsPrefix: onap
 pullPolicy: Always
 image:
   readiness: oomk8s/readiness-check:1.0.0
-  appc: nexus3.onap.org:10001/openecomp/appc-image:1.0-STAGING-latest
+  appc: nexus3.onap.org:10001/openecomp/appc-image:1.1-STAGING-latest
   mysqlServer: mysql/mysql-server:5.6
-  dgbuilderSdnc: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.0-STAGING-latest
+  dgbuilderSdnc: nexus3.onap.org:10001/openecomp/dgbuilder-sdnc-image:1.1-STAGING-latest
-- 
cgit 1.2.3-korg