Merge "Add docker rabbitmq service"

[apex-tripleo-heat-templates.git] / puppet / services / ceph-osd.yaml

diff --git a/puppet/services/ceph-osd.yaml b/puppet/services/ceph-osd.yaml
index e9ed6c2..9bd83aa 100644 (file)
--- a/puppet/services/ceph-osd.yaml
+++ b/puppet/services/ceph-osd.yaml
@@ -46,6 +46,9 @@ outputs:
       step_config: |
         include ::tripleo::profile::base::ceph::osd
       upgrade_batch_tasks:
+        - name: Check status
+          tags: step1,validation
+          shell: ceph health | grep -qv HEALTH_ERR
         - name: Get OSD IDs
           tags: step1
           shell: ls /var/lib/ceph/osd | awk 'BEGIN { FS = "-" } ; { print $2 }'
@@ -65,14 +68,14 @@ outputs:
           command: ceph osd set noscrub
         - name: Stop Ceph OSD
           tags: step1
-          service: name=ceph-osd@$item state=stopped
+          service: name=ceph-osd@{{ item }} state=stopped
           with_items: "{{osd_ids.stdout.strip().split()}}"
         - name: Update ceph OSD packages
           tags: step1
           yum: name=ceph-osd state=latest
         - name: Start ceph-osd service
           tags: step1
-          service: name=ceph-osd@$item state=started
+          service: name=ceph-osd@{{ item }} state=started
           with_items: "{{osd_ids.stdout.strip().split()}}"
         - name: ceph osd unset noout
           tags: step1