Merge "[ceph-mon] Allow for unconditional mon restart"

ceph-mon/Chart.yaml

@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph Mon
 name: ceph-mon
-version: 0.1.24
+version: 0.1.25
 home: https://github.com/ceph/ceph
 ...

ceph-mon/templates/bin/_post-apply.sh.tpl

@@ -118,8 +118,8 @@ done
 
 echo "Latest revision of the helm chart(s) is : $max_release"
 
-if [[ $max_release -gt 1  ]]; then
-  if [[  $require_upgrade -gt 0 ]]; then
+if [[ "$UNCONDITIONAL_MON_RESTART" == "true" ]] || [[ $max_release -gt 1  ]]; then
+  if [[ "$UNCONDITIONAL_MON_RESTART" == "true" ]] || [[  $require_upgrade -gt 0 ]]; then
     echo "Restart ceph-mon pods one at a time to prevent disruption"
     restart_mons
   fi

ceph-mon/templates/job-post-apply.yaml

@@ -100,6 +100,8 @@ spec:
               value: {{ .Release.Namespace }}
             - name: RELEASE_GROUP_NAME
               value: {{ .Release.Name }}
+            - name: UNCONDITIONAL_MON_RESTART
+              value: {{ .Values.conf.storage.unconditional_mon_restart | quote }}
           command:
             - /tmp/post-apply.sh
           volumeMounts:

ceph-mon/values.yaml

@@ -296,6 +296,11 @@ conf:
     mon:
       directory: /var/lib/openstack-helm/ceph/mon
 
+    # The post-apply job will try to determine if mons need to be restarted
+    # and only restart them if necessary. Set this value to "true" to restart
+    # mons unconditionally.
+    unconditional_mon_restart: "false"
+
 daemonset:
   prefix_name: "mon"
 

releasenotes/notes/ceph-mon.yaml

@@ -25,4 +25,5 @@ ceph-mon:
   - 0.1.22 Correct configmap names for all resources
   - 0.1.23 Release-specific ceph-template configmap name
   - 0.1.24 Prevents mgr SA from repeated creation
+  - 0.1.25 Allow for unconditional mon restart
 ...