Run all components in one namespace

[oom.git] / kubernetes / appc / templates / appc-pv-pvc.yaml

diff --git a/kubernetes/appc/templates/appc-pv-pvc.yaml b/kubernetes/appc/templates/appc-pv-pvc.yaml
index 2ce6228..ff0f89a 100644 (file)
--- a/kubernetes/appc/templates/appc-pv-pvc.yaml
+++ b/kubernetes/appc/templates/appc-pv-pvc.yaml
@@ -1,10 +1,11 @@
+#{{ if not .Values.disableAppcAppcDbhost }}
 apiVersion: v1
 kind: PersistentVolume
 metadata:
-  name: "{{ .Values.nsPrefix }}-appc-db"
-  namespace: "{{ .Values.nsPrefix }}-appc"
+  name: "{{ .Values.nsPrefix }}-appc"
+  namespace: "{{ .Values.nsPrefix }}"
   labels:
-    name: "{{ .Values.nsPrefix }}-appc-db"
+    name: "{{ .Values.nsPrefix }}-appc"
 spec:
   capacity:
     storage: 2Gi
@@ -12,13 +13,13 @@ spec:
     - ReadWriteMany
   persistentVolumeReclaimPolicy: Retain
   hostPath:
-    path: /dockerdata-nfs/{{ .Values.nsPrefix }}/appc/data
+    path: {{ .Values.dataRootDir }}/{{ .Values.nsPrefix }}/appc/data
 ---
 kind: PersistentVolumeClaim
 apiVersion: v1
 metadata:
   name: appc-db
-  namespace: "{{ .Values.nsPrefix }}-appc"
+  namespace: "{{ .Values.nsPrefix }}"
 spec:
   accessModes:
     - ReadWriteMany
@@ -27,4 +28,5 @@ spec:
       storage: 2Gi
   selector:
     matchLabels:
-      name: "{{ .Values.nsPrefix }}-appc-db"
+      name: "{{ .Values.nsPrefix }}-appc"
+#{{ end }}