From 95ecdb773c9fa90f9e4f1f792f5cc5dc8328fd6a Mon Sep 17 00:00:00 2001
From: chigang <chigang@huawei.com>
Date: Fri, 30 Jun 2017 20:24:25 +0800
Subject: Remove obsoleted code

JIRA:-

use OpenStack-ansible deploy openstack, so remove obsoleted code.
Some of the enhanced features will be added in later versions

Change-Id: Ie92b92b5de234a7d7d03b578b0bc15fd0218b3b3
Signed-off-by: chigang <chigang@huawei.com>
---
 .../ansible/roles/ceph-osd/tasks/install_osd.yml   | 64 ----------------------
 .../adapters/ansible/roles/ceph-osd/tasks/main.yml | 14 -----
 2 files changed, 78 deletions(-)
 delete mode 100644 deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml
 delete mode 100644 deploy/adapters/ansible/roles/ceph-osd/tasks/main.yml

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

diff --git a/deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml b/deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml
deleted file mode 100644
index 2a9ea3a5..00000000
--- a/deploy/adapters/ansible/roles/ceph-osd/tasks/install_osd.yml
+++ /dev/null
@@ -1,64 +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
-##############################################################################
----
-- name: create osd lv and mount it on /var/local/osd
-  script: create_osd.sh
-
-- name: fetch osd keyring from ceph_adm
-  fetch:
-    src: "/var/lib/ceph/bootstrap-osd/ceph.keyring"
-    dest: "/tmp/ceph.osd.keyring"
-    flat: "yes"
-  delegate_to: "{{ public_vip.ip }}"
-  when: compute_expansion
-
-- name: copy osd keyring
-  copy:
-    src: "/tmp/ceph.osd.keyring"
-    dest: "/var/lib/ceph/bootstrap-osd/ceph.keyring"
-
-- name: prepare osd disk
-  shell: ceph-disk prepare --fs-type xfs /var/local/osd
-
-- name: change local/osd dir owner to ceph
-  shell: chown -R ceph:ceph /var/local/osd
-  when: ansible_os_family == "Debian"
-
-- name: copy ceph-crush-location to osd host
-  copy:
-    src: ceph-crush-location.in
-    dest: /usr/bin/ceph-crush-location
-    mode: 0755
-  when: ansible_os_family == "RedHat"
-
-- name: activate osd node
-  shell: ceph-disk activate /var/local/osd
-
-- name: enable ceph service
-  service: name=ceph enabled=yes
-
-- name: rebuild osd after reboot
-  blockinfile:
-    dest: /etc/init/ceph-osd-all-starter.conf
-    insertafter: "^task"
-    block: |
-      pre-start script
-        set -e
-        /opt/setup_storage/losetup.sh
-        sleep 3
-        mount /dev/storage-volumes/ceph0 /var/local/osd
-      end script
-  when: ansible_os_family == "Debian"
-
-- name: rebuild osd after reboot for centos
-  lineinfile:
-    dest: /etc/init.d/ceph
-    insertafter: "^### END INIT INFO"
-    line: "\nsleep 1\nmount /dev/storage-volumes/ceph0 /var/local/osd"
-  when: ansible_os_family == "RedHat"
diff --git a/deploy/adapters/ansible/roles/ceph-osd/tasks/main.yml b/deploy/adapters/ansible/roles/ceph-osd/tasks/main.yml
deleted file mode 100644
index bc1b29b6..00000000
--- a/deploy/adapters/ansible/roles/ceph-osd/tasks/main.yml
+++ /dev/null
@@ -1,14 +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: install_osd.yml
-  when: inventory_hostname in groups["ceph_osd"]
-  tags:
-    - ceph_osd
-    - ceph_deploy
-- 
cgit 1.2.3-korg