From 819912d0379f6cd2b2693c2968576f7514a117c5 Mon Sep 17 00:00:00 2001
From: liyuenan <liyuenan@huawei.com>
Date: Mon, 19 Dec 2016 11:06:36 +0800
Subject: master only support newton

JIRA: COMPASS-513

Remove other roles and ppa, master only support newton.

Change-Id: I47ddb16baa25902c3e05cc7f9d0d6430f5dc7e00
Signed-off-by: liyuenan <liyuenan@huawei.com>
---
 .../ansible/roles/ceph-mon/tasks/install_mon.yml   | 11 +++++++++++
 .../roles/ceph-mon/templates/ceph-mon.service      | 22 ++++++++++++++++++++++
 .../ansible/roles/ceph-mon/vars/Debian.yml         |  4 ++--
 3 files changed, 35 insertions(+), 2 deletions(-)
 create mode 100644 deploy/adapters/ansible/roles/ceph-mon/templates/ceph-mon.service

(limited to 'deploy/adapters/ansible/roles/ceph-mon')

diff --git a/deploy/adapters/ansible/roles/ceph-mon/tasks/install_mon.yml b/deploy/adapters/ansible/roles/ceph-mon/tasks/install_mon.yml
index 658d109e..1d14c2d2 100644
--- a/deploy/adapters/ansible/roles/ceph-mon/tasks/install_mon.yml
+++ b/deploy/adapters/ansible/roles/ceph-mon/tasks/install_mon.yml
@@ -15,6 +15,17 @@
 - name: Populate the monitor daemon
   shell: "ceph-mon --mkfs -i {{ inventory_hostname }} --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring"
 
+- name: Change ceph/mon dir owner to ceph
+  shell: "chown -R ceph:ceph /var/lib/ceph/mon"
+  when: ansible_os_family == "Debian"
+
+- name: copy templates
+  template:
+    src: ceph-mon.service
+    dest: /lib/systemd/system/ceph-mon.service
+    mode: 0755
+  when: ansible_os_family == "Debian"
+
 - name: Touch the done and auto start file
   file: path="/var/lib/ceph/mon/ceph-{{ inventory_hostname }}/{{ item }}" state="touch"
   with_items:
diff --git a/deploy/adapters/ansible/roles/ceph-mon/templates/ceph-mon.service b/deploy/adapters/ansible/roles/ceph-mon/templates/ceph-mon.service
new file mode 100644
index 00000000..5a3cf753
--- /dev/null
+++ b/deploy/adapters/ansible/roles/ceph-mon/templates/ceph-mon.service
@@ -0,0 +1,22 @@
+[Unit]
+Description=Ceph cluster monitor daemon
+Documentation=man:ceph-mon
+
+After=network-online.target local-fs.target ceph-create-keys.service
+Wants=network-online.target local-fs.target ceph-create-keys.service
+
+PartOf=ceph.target
+
+[Service]
+LimitNOFILE=1048576
+LimitNPROC=1048576
+EnvironmentFile=-/etc/default/ceph
+Environment=CLUSTER=ceph
+ExecStart=/usr/bin/ceph-mon -f --cluster ${CLUSTER} --id {{ inventory_hostname }} --setuser ceph --setgroup ceph
+ExecReload=/bin/kill -HUP $MAINPID
+Restart=on-failure
+RestartSec=30
+TasksMax=infinity
+
+[Install]
+WantedBy=multi-user.target
diff --git a/deploy/adapters/ansible/roles/ceph-mon/vars/Debian.yml b/deploy/adapters/ansible/roles/ceph-mon/vars/Debian.yml
index 16b7989b..a792acad 100644
--- a/deploy/adapters/ansible/roles/ceph-mon/vars/Debian.yml
+++ b/deploy/adapters/ansible/roles/ceph-mon/vars/Debian.yml
@@ -8,5 +8,5 @@
 ##############################################################################
 ---
 
-ceph_start_script: "start ceph-mon id={{ inventory_hostname }}"
-ceph_start_type: "upstart"
+ceph_start_script: "service ceph-mon start"
+ceph_start_type: "systemd"
-- 
cgit 1.2.3-korg