diff --git a/ceph-client/Chart.yaml b/ceph-client/Chart.yaml index 4ea3353d1..da94f9490 100644 --- a/ceph-client/Chart.yaml +++ b/ceph-client/Chart.yaml @@ -15,6 +15,6 @@ apiVersion: v1 appVersion: v1.0.0 description: OpenStack-Helm Ceph Client name: ceph-client -version: 0.1.34 +version: 0.1.35 home: https://github.com/ceph/ceph-client ... diff --git a/ceph-client/templates/bin/pool/_init.sh.tpl b/ceph-client/templates/bin/pool/_init.sh.tpl index 4563c9be2..0d86251a8 100644 --- a/ceph-client/templates/bin/pool/_init.sh.tpl +++ b/ceph-client/templates/bin/pool/_init.sh.tpl @@ -49,7 +49,7 @@ function wait_for_pgs () { pgs_ready=0 query='map({state: .state}) | group_by(.state) | map({state: .[0].state, count: length}) | .[] | select(.state | contains("active") or contains("premerge") | not)' - if [[ $(ceph mon versions | awk '/version/{print $3}' | cut -d. -f1) -ge 14 ]]; then + if [[ $(ceph mon versions | awk '/version/{print $3}' | sort -n | head -n 1 | cut -d. -f1) -ge 14 ]]; then query=".pg_stats | ${query}" fi diff --git a/releasenotes/notes/ceph-client.yaml b/releasenotes/notes/ceph-client.yaml index de9c100b1..ad2e7c617 100644 --- a/releasenotes/notes/ceph-client.yaml +++ b/releasenotes/notes/ceph-client.yaml @@ -35,4 +35,5 @@ ceph-client: - 0.1.32 Simplify test rules for ceph-mgr deployment - 0.1.33 More robust naming of clusterrole-checkdns - 0.1.34 Migrated CronJob resource to batch/v1 API version + - 0.1.35 Handle multiple mon versions in the pool job ...