From cc769464d06bbed5755f84164eb01d16e70248d3 Mon Sep 17 00:00:00 2001
From: =?utf8?q?S=C3=A9bastien=20Han?= <seb@redhat.com>
Date: Thu, 16 Feb 2017 18:31:32 +0100
Subject: [PATCH] docker: homogenise systemd file location
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

So unit files were stored in /var/lib/ceph some where in
/etc/systemd/system. Now they are all under /etc/systemd/system.

closes: #1296

Signed-off-by: Sébastien Han <seb@redhat.com>
---
 .../ceph-mds/tasks/docker/start_docker_mds.yml | 13 +++----------
 .../ceph-nfs/tasks/docker/start_docker_nfs.yml | 18 ++++++------------
 .../ceph-rgw/tasks/docker/start_docker_rgw.yml | 13 +++----------
 3 files changed, 12 insertions(+), 32 deletions(-)

diff --git a/roles/ceph-mds/tasks/docker/start_docker_mds.yml b/roles/ceph-mds/tasks/docker/start_docker_mds.yml
index d49e56e67..b6643aa1c 100644
--- a/roles/ceph-mds/tasks/docker/start_docker_mds.yml
+++ b/roles/ceph-mds/tasks/docker/start_docker_mds.yml
@@ -1,27 +1,20 @@
 ---
-# Use systemd to manage container on Atomic host
 - name: generate systemd unit file
   become: true
   template:
     src: "{{ role_path }}/templates/ceph-mds.service.j2"
-    dest: /var/lib/ceph/ceph-mds@.service
+    dest: /etc/systemd/system/ceph-mds@.service
     owner: "root"
     group: "root"
     mode: "0644"
 
-- name: link systemd unit file for mds instance
-  file:
-    src: /var/lib/ceph/ceph-mds@.service
-    dest: /etc/systemd/system/multi-user.target.wants/ceph-mds@{{ ansible_hostname }}.service
-    state: link
-
 - name: enable systemd unit file for mds instance
-  command: systemctl enable /etc/systemd/system/multi-user.target.wants/ceph-mds@{{ ansible_hostname }}.service
+  shell: systemctl enable ceph-mds@{{ ansible_hostname }}.service
   failed_when: false
   changed_when: false
 
 - name: reload systemd unit files
-  command: systemctl daemon-reload
+  shell: systemctl daemon-reload
   changed_when: false
   failed_when: false
 
diff --git a/roles/ceph-nfs/tasks/docker/start_docker_nfs.yml b/roles/ceph-nfs/tasks/docker/start_docker_nfs.yml
index b4685a6b7..59743d942 100644
--- a/roles/ceph-nfs/tasks/docker/start_docker_nfs.yml
+++ b/roles/ceph-nfs/tasks/docker/start_docker_nfs.yml
@@ -1,22 +1,15 @@
 ---
-# Use systemd to manage container on Atomic host and CoreOS
 - name: generate systemd unit file
   become: true
   template:
-    src: "{{ playbook_dir }}/roles/ceph-nfs/templates/ceph-nfs.service.j2"
-    dest: /var/lib/nfs/ganesha/ceph-nfs@.service
+    src: "{{ role_path }}/templates/ceph-nfs.service.j2"
+    dest: /etc/systemd/system/ceph-nfs@.service
     owner: "root"
     group: "root"
     mode: "0644"
 
-- name: link systemd unit file for NFS instance
-  file:
-    src: /var/lib/nfs/ganesha/ceph-nfs@.service
-    dest: /etc/systemd/system/multi-user.target.wants/ceph-nfs@{{ ansible_hostname }}.service
-    state: link
-
-- name: enable systemd unit file for NFS instance
-  shell: systemctl enable /etc/systemd/system/multi-user.target.wants/ceph-nfs@{{ ansible_hostname }}.service
+- name: enable systemd unit file for nfs instance
+  shell: systemctl enable ceph-nfs@{{ ansible_hostname }}.service
   failed_when: false
   changed_when: false
 
@@ -25,7 +18,7 @@
   changed_when: false
   failed_when: false
 
-- name: systemd start NFS container
+- name: systemd start nfs container
   service:
     name: ceph-nfs@{{ ansible_hostname }}
     state: started
@@ -36,3 +29,4 @@
   wait_for:
       path: "/etc/ceph/{{ cluster }}.conf"
   when: is_atomic
+
diff --git a/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml b/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml
index d86a062c9..e3bef3603 100644
--- a/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml
+++ b/roles/ceph-rgw/tasks/docker/start_docker_rgw.yml
@@ -1,22 +1,15 @@
 ---
-# Use systemd to manage container on Atomic host
 - name: generate systemd unit file
   become: true
   template:
-    src: "{{ playbook_dir }}/roles/ceph-rgw/templates/ceph-rgw.service.j2"
-    dest: /var/lib/ceph/ceph-rgw@.service
+    src: "{{ role_path }}/templates/ceph-rgw.service.j2"
+    dest: /etc/systemd/system/ceph-rgw@.service
     owner: "root"
     group: "root"
     mode: "0644"
 
-- name: link systemd unit file for rgw instance
-  file:
-    src: /var/lib/ceph/ceph-rgw@.service
-    dest: /etc/systemd/system/multi-user.target.wants/ceph-rgw@{{ ansible_hostname }}.service
-    state: link
-
 - name: enable systemd unit file for rgw instance
-  shell: systemctl enable /etc/systemd/system/multi-user.target.wants/ceph-rgw@{{ ansible_hostname }}.service
+  shell: systemctl enable ceph-rgw@{{ ansible_hostname }}.service
   failed_when: false
   changed_when: false
 
-- 
2.39.5