Browse Source

Merge pull request #7267 from SaravanaStorageNetwork/templates_fix

Update glusterfs-template
Scott Dodson 7 years ago
parent
commit
8c18cb0fca

+ 2 - 2
roles/openshift_storage_glusterfs/files/v1.5/glusterfs-template.yml

@@ -71,7 +71,7 @@ objects:
               - systemctl status glusterd.service
             periodSeconds: 25
             successThreshold: 1
-            failureThreshold: 15
+            failureThreshold: 50
           livenessProbe:
             timeoutSeconds: 3
             initialDelaySeconds: 40
@@ -82,7 +82,7 @@ objects:
               - systemctl status glusterd.service
             periodSeconds: 25
             successThreshold: 1
-            failureThreshold: 15
+            failureThreshold: 50
           resources: {}
           terminationMessagePath: "/dev/termination-log"
         volumes:

+ 4 - 2
roles/openshift_storage_glusterfs/files/v3.10/glusterfs-template.yml

@@ -40,6 +40,8 @@ objects:
             value: "${GB_GLFS_LRU_COUNT}"
           - name: TCMU_LOGDIR
             value: "${TCMU_LOGDIR}"
+          - name: GB_LOGDIR
+            value: "/var/log/glusterfs/gluster-block"
           resources:
             requests:
               memory: 100Mi
@@ -82,7 +84,7 @@ objects:
               - systemctl status glusterd.service
             periodSeconds: 25
             successThreshold: 1
-            failureThreshold: 15
+            failureThreshold: 50
           livenessProbe:
             timeoutSeconds: 3
             initialDelaySeconds: 40
@@ -93,7 +95,7 @@ objects:
               - systemctl status glusterd.service
             periodSeconds: 25
             successThreshold: 1
-            failureThreshold: 15
+            failureThreshold: 50
           terminationMessagePath: "/dev/termination-log"
         volumes:
         - name: glusterfs-heketi

+ 4 - 2
roles/openshift_storage_glusterfs/files/v3.6/glusterfs-template.yml

@@ -40,6 +40,8 @@ objects:
             value: "${GB_GLFS_LRU_COUNT}"
           - name: TCMU_LOGDIR
             value: "${TCMU_LOGDIR}"
+          - name: GB_LOGDIR
+            value: "/var/log/glusterfs/gluster-block"
           resources:
             requests:
               memory: 100Mi
@@ -82,7 +84,7 @@ objects:
               - systemctl status glusterd.service
             periodSeconds: 25
             successThreshold: 1
-            failureThreshold: 15
+            failureThreshold: 50
           livenessProbe:
             timeoutSeconds: 3
             initialDelaySeconds: 40
@@ -93,7 +95,7 @@ objects:
               - systemctl status glusterd.service
             periodSeconds: 25
             successThreshold: 1
-            failureThreshold: 15
+            failureThreshold: 50
           terminationMessagePath: "/dev/termination-log"
         volumes:
         - name: glusterfs-heketi

+ 4 - 2
roles/openshift_storage_glusterfs/files/v3.7/glusterfs-template.yml

@@ -40,6 +40,8 @@ objects:
             value: "${GB_GLFS_LRU_COUNT}"
           - name: TCMU_LOGDIR
             value: "${TCMU_LOGDIR}"
+          - name: GB_LOGDIR
+            value: "/var/log/glusterfs/gluster-block"
           resources:
             requests:
               memory: 100Mi
@@ -82,7 +84,7 @@ objects:
               - systemctl status glusterd.service
             periodSeconds: 25
             successThreshold: 1
-            failureThreshold: 15
+            failureThreshold: 50
           livenessProbe:
             timeoutSeconds: 3
             initialDelaySeconds: 40
@@ -93,7 +95,7 @@ objects:
               - systemctl status glusterd.service
             periodSeconds: 25
             successThreshold: 1
-            failureThreshold: 15
+            failureThreshold: 50
           terminationMessagePath: "/dev/termination-log"
         volumes:
         - name: glusterfs-heketi

+ 4 - 2
roles/openshift_storage_glusterfs/files/v3.8/glusterfs-template.yml

@@ -40,6 +40,8 @@ objects:
             value: "${GB_GLFS_LRU_COUNT}"
           - name: TCMU_LOGDIR
             value: "${TCMU_LOGDIR}"
+          - name: GB_LOGDIR
+            value: "/var/log/glusterfs/gluster-block"
           resources:
             requests:
               memory: 100Mi
@@ -82,7 +84,7 @@ objects:
               - systemctl status glusterd.service
             periodSeconds: 25
             successThreshold: 1
-            failureThreshold: 15
+            failureThreshold: 50
           livenessProbe:
             timeoutSeconds: 3
             initialDelaySeconds: 40
@@ -93,7 +95,7 @@ objects:
               - systemctl status glusterd.service
             periodSeconds: 25
             successThreshold: 1
-            failureThreshold: 15
+            failureThreshold: 50
           terminationMessagePath: "/dev/termination-log"
         volumes:
         - name: glusterfs-heketi

+ 4 - 2
roles/openshift_storage_glusterfs/files/v3.9/glusterfs-template.yml

@@ -40,6 +40,8 @@ objects:
             value: "${GB_GLFS_LRU_COUNT}"
           - name: TCMU_LOGDIR
             value: "${TCMU_LOGDIR}"
+          - name: GB_LOGDIR
+            value: "/var/log/glusterfs/gluster-block"
           resources:
             requests:
               memory: 100Mi
@@ -82,7 +84,7 @@ objects:
               - systemctl status glusterd.service
             periodSeconds: 25
             successThreshold: 1
-            failureThreshold: 15
+            failureThreshold: 50
           livenessProbe:
             timeoutSeconds: 3
             initialDelaySeconds: 40
@@ -93,7 +95,7 @@ objects:
               - systemctl status glusterd.service
             periodSeconds: 25
             successThreshold: 1
-            failureThreshold: 15
+            failureThreshold: 50
           terminationMessagePath: "/dev/termination-log"
         volumes:
         - name: glusterfs-heketi