aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/services/ceph-rgw.yaml
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-03-02 09:49:37 +0000
committerGerrit Code Review <review@openstack.org>2017-03-02 09:49:37 +0000
commit6c24b0a159ca0ca8f76e0dffe13430c7c9f8cb5c (patch)
tree586aefab98b0fc462f8c6c8499e0fca2cef48206 /puppet/services/ceph-rgw.yaml
parent09794f09aaaa6d4ab10cb7bbb7ee1f69b63fc09d (diff)
parent7c84a9b390c469e716e5802eef078d2df3902c6a (diff)
Merge "upgrades/validation: only run validation when services exist"
Diffstat (limited to 'puppet/services/ceph-rgw.yaml')
-rw-r--r--puppet/services/ceph-rgw.yaml9
1 files changed, 8 insertions, 1 deletions
diff --git a/puppet/services/ceph-rgw.yaml b/puppet/services/ceph-rgw.yaml
index c5b29c7e..01531971 100644
--- a/puppet/services/ceph-rgw.yaml
+++ b/puppet/services/ceph-rgw.yaml
@@ -79,14 +79,21 @@ outputs:
ceph::rgw::keystone::auth::password: {get_param: SwiftPassword}
upgrade_tasks:
- name: Gather RGW instance ID
- tags: step0
+ tags: common
shell: hiera -c /etc/puppet/hiera.yaml ceph::profile::params::rgw_name radosgw.gateway
register: rgw_id
+ - name: Check if ceph_rgw is deployed
+ command: systemctl is-enabled ceph-radosgw@{{rgw_id.stdout}}
+ tags: common
+ ignore_errors: True
+ register: ceph_rgw_enabled
- name: Check status
shell: /usr/bin/systemctl show ceph-radosgw@{{rgw_id.stdout}} --property ActiveState | grep '\bactive\b'
+ when: ceph_rgw_enabled.rc == 0
tags: step0,validation
- name: Stop RGW instance
tags: step1
+ when: ceph_rgw_enabled.rc == 0
service:
name: ceph-radosgw@{{rgw_id.stdout}}
state: stopped