Make neutron dhcp agents per network conditional

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

diff --git a/puppet/services/ceph-mon.yaml b/puppet/services/ceph-mon.yaml
index 0c61305..1ce5833 100644 (file)
--- a/puppet/services/ceph-mon.yaml
+++ b/puppet/services/ceph-mon.yaml
@@ -117,6 +117,9 @@ outputs:
         # Note we perform these tasks in list order, but they are all step0 so
         # we can perform a rolling upgrade of all mon nodes in step0, then a
         # rolling upgrade of all osd nodes in step1
+        - name: Check status
+          tags: step0,validation
+          shell: ceph health | grep -qv HEALTH_ERR
         # FIXME(shardy) I suspect we can use heat or ansible facts here instead?
         - name: Get hostname
           tags: step0
@@ -127,7 +130,7 @@ outputs:
           service: name=ceph-mon@{{mon_id.stdout}} pattern=ceph-mon state=stopped
         - name: Update ceph packages
           tags: step0
-          yum: name=ceph-mon,ceph state=latest
+          yum: name=ceph-mon state=latest
         - name: Start ceph-mon service
           tags: step0
           service: name=ceph-mon@{{mon_id.stdout}} state=started