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>
---
 .../roles/ceph-osd/files/ceph-crush-location.in    | 79 ----------------------
 .../ansible/roles/ceph-osd/files/create_osd.sh     | 39 -----------
 2 files changed, 118 deletions(-)
 delete mode 100644 deploy/adapters/ansible/roles/ceph-osd/files/ceph-crush-location.in
 delete mode 100755 deploy/adapters/ansible/roles/ceph-osd/files/create_osd.sh

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

diff --git a/deploy/adapters/ansible/roles/ceph-osd/files/ceph-crush-location.in b/deploy/adapters/ansible/roles/ceph-osd/files/ceph-crush-location.in
deleted file mode 100644
index d7637510..00000000
--- a/deploy/adapters/ansible/roles/ceph-osd/files/ceph-crush-location.in
+++ /dev/null
@@ -1,79 +0,0 @@
-#!/bin/sh
-#
-# Generate a CRUSH location for the given entity
-#
-# The CRUSH location consists of a list of key=value pairs, separated
-# by spaces, all on a single line.  This describes where in CRUSH
-# hierarhcy this entity should be placed.
-#
-# Arguments:
-#   --cluster <clustername>   name of the cluster (see /etc/ceph/$cluster.conf)
-#   --type <osd|mds|client>   daemon/entity type
-#   --id <id>                 id (osd number, mds name, client name)
-#
-
-# if we start up as ./ceph-crush-location, assume everything else is
-# in the current directory too.
-if [ `dirname $0` = "." ] && [ $PWD != "/usr/bin" ]; then
-    BINDIR=.
-    SBINDIR=.
-    LIBDIR=.
-    ETCDIR=.
-else
-    BINDIR=@bindir@
-    SBINDIR=@prefix@/sbin
-    LIBDIR=@libdir@/ceph
-    ETCDIR=@sysconfdir@/ceph
-fi
-
-usage_exit() {
-    echo "usage: $0 [--cluster <cluster>] --id <id> --type <osd|mds|client>"
-    exit
-}
-
-cluster="ceph"
-type=""
-id=""
-while [ $# -ge 1 ]; do
-    case $1 in
-	--cluster | -C)
-	    shift
-	    cluster="$1"
-	    shift
-	    ;;
-	--id | -i)
-	    shift
-	    id="$1"
-	    shift
-	    ;;
-	--type | -t)
-	    shift
-	    type="$1"
-	    shift
-	    ;;
-	*)
-	    echo "unrecognized option '$1'"
-	    usage_exit
-	    ;;
-    esac
-done
-
-if [ -z "$type" ]; then
-    echo "must specify entity type"
-    usage_exit
-fi
-
-if [ -z "$id" ]; then
-    echo "must specify id"
-    usage_exit
-fi
-
-# try a generic location
-location="$($BINDIR/ceph-conf --cluster=${cluster:-ceph} --name=$type.$id --lookup crush_location || :)"
-if [ -n "$location" ]; then
-    echo $location
-    exit 0
-fi
-
-# spit out something generic
-echo "host=$(hostname -s) root=default"
diff --git a/deploy/adapters/ansible/roles/ceph-osd/files/create_osd.sh b/deploy/adapters/ansible/roles/ceph-osd/files/create_osd.sh
deleted file mode 100755
index dd815c22..00000000
--- a/deploy/adapters/ansible/roles/ceph-osd/files/create_osd.sh
+++ /dev/null
@@ -1,39 +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
-##############################################################################
-if [ -d "/var/local/osd" ]; then
-echo "clear /var/local/osd"
-rm -r /var/local/osd/
-umount /var/local/osd
-rm -r /var/local/osd
-fi
-
-
-#safe check
-ps -ef |grep lvremove |awk '{print $2}' |xargs kill -9
-ps -ef |grep vgremove |awk '{print $2}' |xargs kill -9
-ps -ef |grep vgcreate |awk '{print $2}' |xargs kill -9
-ps -ef |grep lvcreate |awk '{print $2}' |xargs kill -9
-
-if [ -L "/dev/storage-volumes/ceph0" ]; then
-echo "remove lv vg"
-lvremove -f /dev/storage-volumes/ceph0
-fi
-
-
-echo "lvcreate"
-lvcreate -l 100%FREE -nceph0 storage-volumes
-echo "mkfs"
-mkfs.xfs -f /dev/storage-volumes/ceph0
-
-if [ ! -d "/var/local/osd" ]; then
-echo "mount osd"
-mkdir -p /var/local/osd
-mount /dev/storage-volumes/ceph0 /var/local/osd
-fi
-
-- 
cgit 1.2.3-korg