From: Guillaume Abrioux Date: Mon, 30 Sep 2019 09:02:52 +0000 (+0200) Subject: rbdmirror: rename a file X-Git-Tag: v5.0.0alpha1~81 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=ed8616aa66b718274c5196f70b5a3223fcaf216b;p=ceph-ansible.git rbdmirror: rename a file rename this file to be more generic. Signed-off-by: Guillaume Abrioux --- diff --git a/roles/ceph-rbd-mirror/tasks/main.yml b/roles/ceph-rbd-mirror/tasks/main.yml index 6388567c2..1544c17b7 100644 --- a/roles/ceph-rbd-mirror/tasks/main.yml +++ b/roles/ceph-rbd-mirror/tasks/main.yml @@ -18,8 +18,8 @@ set_fact: container_exec_cmd: "{{ container_binary }} exec ceph-rbd-mirror-{{ ansible_hostname }}" - - name: include start_docker_rbd_mirror.yml - include_tasks: start_docker_rbd_mirror.yml + - name: include start_container_rbd_mirror.yml + include_tasks: start_container_rbd_mirror.yml - name: include configure_mirroring.yml include_tasks: configure_mirroring.yml diff --git a/roles/ceph-rbd-mirror/tasks/start_container_rbd_mirror.yml b/roles/ceph-rbd-mirror/tasks/start_container_rbd_mirror.yml new file mode 100644 index 000000000..cebeccff4 --- /dev/null +++ b/roles/ceph-rbd-mirror/tasks/start_container_rbd_mirror.yml @@ -0,0 +1,12 @@ +--- +# Use systemd to manage container on Atomic host +- name: include_tasks systemd.yml + include_tasks: systemd.yml + +- name: systemd start rbd mirror container + systemd: + name: ceph-rbd-mirror@rbd-mirror.{{ ansible_hostname }} + state: started + enabled: yes + masked: no + daemon_reload: yes diff --git a/roles/ceph-rbd-mirror/tasks/start_docker_rbd_mirror.yml b/roles/ceph-rbd-mirror/tasks/start_docker_rbd_mirror.yml deleted file mode 100644 index cebeccff4..000000000 --- a/roles/ceph-rbd-mirror/tasks/start_docker_rbd_mirror.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -# Use systemd to manage container on Atomic host -- name: include_tasks systemd.yml - include_tasks: systemd.yml - -- name: systemd start rbd mirror container - systemd: - name: ceph-rbd-mirror@rbd-mirror.{{ ansible_hostname }} - state: started - enabled: yes - masked: no - daemon_reload: yes