From 819912d0379f6cd2b2693c2968576f7514a117c5 Mon Sep 17 00:00:00 2001 From: liyuenan 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 --- .../roles/ceph-mon/tasks/install_mon.yml | 43 ---------------------- .../roles/ceph-mon/templates/ceph-mon.service | 22 ----------- .../roles/ceph-mon/vars/Debian.yml | 12 ------ 3 files changed, 77 deletions(-) delete mode 100644 deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-mon/tasks/install_mon.yml delete mode 100644 deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-mon/templates/ceph-mon.service delete mode 100644 deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-mon/vars/Debian.yml (limited to 'deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-mon') diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-mon/tasks/install_mon.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-mon/tasks/install_mon.yml deleted file mode 100644 index 1d14c2d2..00000000 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-mon/tasks/install_mon.yml +++ /dev/null @@ -1,43 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## - -- include_vars: "{{ ansible_os_family }}.yml" - -- name: Create a default data directory - file: path="/var/lib/ceph/mon/ceph-{{ inventory_hostname }}" state="directory" - -- 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: - - "done" - - "{{ ceph_start_type }}" - -- name: start mon daemon - shell: "{{ ceph_start_script }}" - -- name: wait for creating osd keyring - wait_for: path=/var/lib/ceph/bootstrap-osd/ceph.keyring - -- name: fetch osd keyring - fetch: src="/var/lib/ceph/bootstrap-osd/ceph.keyring" dest="/tmp/ceph.osd.keyring" flat=yes - run_once: True diff --git a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-mon/templates/ceph-mon.service b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-mon/templates/ceph-mon.service deleted file mode 100644 index 5a3cf753..00000000 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-mon/templates/ceph-mon.service +++ /dev/null @@ -1,22 +0,0 @@ -[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/openstack_mitaka_xenial/roles/ceph-mon/vars/Debian.yml b/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-mon/vars/Debian.yml deleted file mode 100644 index a792acad..00000000 --- a/deploy/adapters/ansible/openstack_mitaka_xenial/roles/ceph-mon/vars/Debian.yml +++ /dev/null @@ -1,12 +0,0 @@ -############################################################################## -# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others. -# -# All rights reserved. This program and the accompanying materials -# are made available under the terms of the Apache License, Version 2.0 -# which accompanies this distribution, and is available at -# http://www.apache.org/licenses/LICENSE-2.0 -############################################################################## ---- - -ceph_start_script: "service ceph-mon start" -ceph_start_type: "systemd" -- cgit 1.2.3-korg