X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fceph-rgw.yaml;h=01531971605362f7eb3b175aab2b9b7dfbb7a33d;hb=d22484d389b1e2f5e9dd9ea6d9f4196effa31f1c;hp=d7014e545b53f7db0601c18447048ec3b450fd8c;hpb=6e05804f037bc69393f038d8bd7e9cd8cf1cdf63;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/ceph-rgw.yaml b/puppet/services/ceph-rgw.yaml
index d7014e54..01531971 100644
--- a/puppet/services/ceph-rgw.yaml
+++ b/puppet/services/ceph-rgw.yaml
@@ -79,12 +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
-          service: name=ceph-radosgw@{{rgw_id.stdout}} state=stopped
+          when: ceph_rgw_enabled.rc == 0
+          service:
+            name: ceph-radosgw@{{rgw_id.stdout}}
+            state: stopped