Merge "Fix the checkPGs cronjob"

ceph-mon/templates/cronjob-checkPGs.yaml

@@ -29,10 +29,12 @@ rules:
       - ""
     resources:
       - pods
+      - pods/exec
     verbs:
       - get
       - list
       - watch
+      - create
 ---
 apiVersion: rbac.authorization.k8s.io/v1beta1
 kind: RoleBinding
@@ -82,7 +84,7 @@ spec:
                     fieldPath: metadata.namespace
             command:
               - /tmp/utils-checkPGs.sh
-          volumeMounts:
+            volumeMounts:
               - name: ceph-mon-bin
                 mountPath: /tmp/utils-checkPGs.py
                 subPath: utils-checkPGs.py

ceph-mon/values.yaml

@@ -107,8 +107,8 @@ network:
 
 jobs:
   pool_checkPGs:
-    # Execute monthly on the 1st at 00:01 AM
-    cron: "1 0 1 * *"
+    # Execute every 15 minutes
+    cron: "*/15 * * * *"
     history:
       # Number of successful job to keep
       successJob: 1
@@ -294,4 +294,4 @@ manifests:
   service_mon: true
   service_mon_discovery: true
   job_storage_admin_keys: true
-  cronjob_checkPGs: true
+  cronjob_checkPGs: false

tools/deployment/multinode/030-ceph.sh

@@ -74,6 +74,9 @@ conf:
         journal:
           type: directory
           location: /var/lib/openstack-helm/ceph/osd/journal-one
+
+manifests:
+  cronjob_checkPGs: true
 EOF
 
 for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do

tools/deployment/osh-infra-logging/020-ceph.sh

@@ -172,6 +172,9 @@ pod:
     mds: 1
     mgr: 1
     rgw: 1
+
+manifests:
+  cronjob_checkPGs: true
 EOF
 
 for CHART in ceph-mon ceph-osd ceph-client ceph-provisioners; do