From: Guillaume Abrioux <gabrioux@redhat.com>
Date: Sun, 24 Sep 2017 02:52:51 +0000 (+0200)
Subject: update: update rgw systemd unit name
X-Git-Tag: v3.0.0rc11~3^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F1948%2Fhead;p=ceph-ansible.git

update: update rgw systemd unit name

The old name is used in `rolling_update.yml` and
`purge-docker-cluster.yml`, it breaks the
`test_rgw_service_is_running()` test.

Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>
---

diff --git a/infrastructure-playbooks/purge-docker-cluster.yml b/infrastructure-playbooks/purge-docker-cluster.yml
index 7941752bd..5e6917109 100644
--- a/infrastructure-playbooks/purge-docker-cluster.yml
+++ b/infrastructure-playbooks/purge-docker-cluster.yml
@@ -107,7 +107,7 @@
 
   - name: disable ceph rgw service (new unit name)
     service:
-      name: "ceph-radosgw@{{ ansible_hostname }}"
+      name: "ceph-radosgw@rgw.{{ ansible_hostname }}"
       state: stopped
       enabled: no
     ignore_errors: true
diff --git a/infrastructure-playbooks/rolling_update.yml b/infrastructure-playbooks/rolling_update.yml
index 308a188ef..ba8d2bac7 100644
--- a/infrastructure-playbooks/rolling_update.yml
+++ b/infrastructure-playbooks/rolling_update.yml
@@ -483,7 +483,7 @@
 
     - name: restart containerized ceph rgws with systemd
       service:
-        name: ceph-radosgw@{{ ansible_hostname }}
+        name: ceph-radosgw@rgw.{{ ansible_hostname }}
         state: restarted
         enabled: yes
       when: