Use systemd module instead of service.

Using systemd module allows us to do in one task what we did in three
tasks:

- enable unit file,
- issue a `daemon-reload`,
- start the service

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

diff --git a/roles/ceph-mds/tasks/docker/start_docker_mds.yml b/roles/ceph-mds/tasks/docker/start_docker_mds.yml
index b6643aa1c6d2e0e34d1639cc4201aeaafa47bc1a..3f69c8cb2ffe57513057e6572fe52ff3f5e0d768 100644 (file)
--- a/roles/ceph-mds/tasks/docker/start_docker_mds.yml
+++ b/roles/ceph-mds/tasks/docker/start_docker_mds.yml
@@ -8,19 +8,10 @@
     group: "root"
     mode: "0644"
 
-- name: enable systemd unit file for mds instance
-  shell: systemctl enable ceph-mds@{{ ansible_hostname }}.service
-  failed_when: false
-  changed_when: false
-
-- name: reload systemd unit files
-  shell: systemctl daemon-reload
-  changed_when: false
-  failed_when: false
-
 - name: systemd start mds container
-  service:
+  systemd:
     name: ceph-mds@{{ ansible_hostname }}
     state: started
     enabled: yes
+    daemon_reload: yes
   changed_when: false

diff --git a/roles/ceph-mgr/tasks/docker/start_docker_mgr.yml b/roles/ceph-mgr/tasks/docker/start_docker_mgr.yml
index 254de9f46b080f18db0aa02b17382b1d5e9fd688..d7e2af10c93083e35eeacdcd21958156b0077dc9 100644 (file)
--- a/roles/ceph-mgr/tasks/docker/start_docker_mgr.yml
+++ b/roles/ceph-mgr/tasks/docker/start_docker_mgr.yml
@@ -8,19 +8,10 @@
     group: "root"
     mode: "0644"
 
-- name: enable systemd unit file for mgr instance
-  shell: systemctl enable ceph-mgr@{{ ansible_hostname }}.service
-  failed_when: false
-  changed_when: false
-
-- name: reload systemd unit files
-  shell: systemctl daemon-reload
-  changed_when: false
-  failed_when: false
-
 - name: systemd start mgr container
-  service:
+  systemd:
     name: ceph-mgr@{{ ansible_hostname }}
     state: started
     enabled: yes
+    daemon_reload: yes
   changed_when: false

diff --git a/roles/ceph-mon/tasks/docker/start_docker_monitor.yml b/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
index 5a7d770ce959e7331460f0f2204e8c0029df66d8..851f4207f3afe06063b1b26b568bb8189eb655f1 100644 (file)
--- a/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
+++ b/roles/ceph-mon/tasks/docker/start_docker_monitor.yml
@@ -49,19 +49,10 @@
     group: "root"
     mode: "0644"
 
-- name: enable systemd unit file for mon instance
-  shell: systemctl enable ceph-mon@{{ ansible_hostname }}.service
-  failed_when: false
-  changed_when: false
-
-- name: reload systemd unit files
-  shell: systemctl daemon-reload
-  changed_when: false
-  failed_when: false
-
 - name: systemd start mon container
-  service:
+  systemd:
     name: ceph-mon@{{ ansible_hostname }}
     state: started
     enabled: yes
+    daemon_reload: yes
   changed_when: false

diff --git a/roles/ceph-osd/tasks/docker/start_docker_osd.yml b/roles/ceph-osd/tasks/docker/start_docker_osd.yml
index bab4e7ce9bf4edd04455d1b64108344a3fc2b822..ecafcd92648d302cbffa1f57c3d5863b8e2c0aca 100644 (file)
--- a/roles/ceph-osd/tasks/docker/start_docker_osd.yml
+++ b/roles/ceph-osd/tasks/docker/start_docker_osd.yml
@@ -28,19 +28,11 @@
     group: "root"
     mode: "0644"
 
-- name: enable systemd unit file for osd instance
-  shell: systemctl enable ceph-osd@{{ item | basename }}.service
-  changed_when: false
-  with_items: "{{ devices }}"
-
-- name: reload systemd unit files
-  shell: systemctl daemon-reload
-  changed_when: false
-
 - name: systemd start osd container
-  service:
+  systemd:
     name: ceph-osd@{{ item | basename }}
     state: started
     enabled: yes
+    daemon_reload: yes
   changed_when: false
   with_items: "{{ devices }}"

diff --git a/roles/ceph-rbd-mirror/tasks/docker/start_docker_rbd_mirror.yml b/roles/ceph-rbd-mirror/tasks/docker/start_docker_rbd_mirror.yml
index c86c84c180d37ffb608dbbdd3d53114a5a354928..7f3eac0d9778baa12d2b7ed071022d683bfd6e5f 100644 (file)
--- a/roles/ceph-rbd-mirror/tasks/docker/start_docker_rbd_mirror.yml
+++ b/roles/ceph-rbd-mirror/tasks/docker/start_docker_rbd_mirror.yml
@@ -9,19 +9,10 @@
     group: "root"
     mode: "0644"
 
-- name: enable systemd unit file for rbd mirror instance
-  command: systemctl enable ceph-rbd-mirror@rbd-mirror.{{ ansible_hostname }}.service
-  failed_when: false
-  changed_when: false
-
-- name: reload systemd unit files
-  command: systemctl daemon-reload
-  changed_when: false
-  failed_when: false
-
 - name: systemd start rbd mirror container
-  service:
+  systemd:
     name: ceph-rbd-mirror@rbd-mirror.{{ ansible_hostname }}
     state: started
     enabled: yes
+    daemon_reload: yes
   changed_when: false