[ceph-osd] Skip pod wait in post-apply job when disruptive

The new, disruptive post-apply logic to restart ceph-osd pods more
efficiently on upgrade still waits for pods to be in a non-
disruptive state before restarting them disruptively. This change
skips that wait if a disruptive restart is in progress.

Change-Id: I484a3b899c61066aab6be43c4077fff2db6f54bc

ceph-osd/Chart.yaml

@@ -15,6 +15,6 @@ apiVersion: v1
 appVersion: v1.0.0
 description: OpenStack-Helm Ceph OSD
 name: ceph-osd
-version: 0.1.37
+version: 0.1.38
 home: https://github.com/ceph/ceph
 ...

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

@@ -166,7 +166,9 @@ function restart_by_rack() {
   done
 }
 
-wait_for_pods $CEPH_NAMESPACE
+if [[ "$DISRUPTIVE_OSD_RESTART" != "true" ]]; then
+  wait_for_pods $CEPH_NAMESPACE
+fi
 
 require_upgrade=0
 max_release=0

releasenotes/notes/ceph-osd.yaml

@@ -38,4 +38,5 @@ ceph-osd:
   - 0.1.35 Consolidate mon_endpoints discovery
   - 0.1.36 Add OSD device location pre-check
   - 0.1.37 Add a disruptive OSD restart to the post-apply job
+  - 0.1.38 Skip pod wait in post-apply job when disruptive
 ...