summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-01-26 20:05:23 +0000
committerGerrit Code Review <review@openstack.org>2017-01-26 20:05:23 +0000
commitfd72fbd39a10504a6812bd300d070f042c9ac335 (patch)
tree449608db79b5b39daeb1b039bed48e5629ec74e1
parent98d1795278a79eff606153ed380b03e621cd61c4 (diff)
parentbf4c3f21ce5ad2cc87ed2a2efda7ea3bb188c428 (diff)
Merge "Do not try to update the 'ceph' metapackage from CephMon role"
-rw-r--r--puppet/services/ceph-mon.yaml5
-rw-r--r--puppet/services/ceph-osd.yaml3
2 files changed, 7 insertions, 1 deletions
diff --git a/puppet/services/ceph-mon.yaml b/puppet/services/ceph-mon.yaml
index 0c61305d..1ce58335 100644
--- 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
diff --git a/puppet/services/ceph-osd.yaml b/puppet/services/ceph-osd.yaml
index e9ed6c29..98f83d08 100644
--- 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 }'