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-config/tasks/create_config.yml      | 94 ----------------------
 .../ansible/roles/ceph-config/tasks/main.yml       | 14 ----
 2 files changed, 108 deletions(-)
 delete mode 100755 deploy/adapters/ansible/roles/ceph-config/tasks/create_config.yml
 delete mode 100755 deploy/adapters/ansible/roles/ceph-config/tasks/main.yml

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

diff --git a/deploy/adapters/ansible/roles/ceph-config/tasks/create_config.yml b/deploy/adapters/ansible/roles/ceph-config/tasks/create_config.yml
deleted file mode 100755
index b0be0f2e..00000000
--- a/deploy/adapters/ansible/roles/ceph-config/tasks/create_config.yml
+++ /dev/null
@@ -1,94 +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: gen ceph fsid
-  shell: uuidgen
-  register: ceph_fsid
-  when: inventory_hostname in groups['ceph_adm']
-
-- name: gen ceph conf
-  local_action:
-    module: "template"
-    src: "ceph.j2"
-    dest: "/tmp/ceph.conf"
-  when: inventory_hostname in groups['ceph_adm']
-
-- name: fetch ceph conf from ceph_adm
-  fetch: src="/etc/ceph/ceph.conf" dest="/tmp/ceph.conf" flat=yes
-  delegate_to: "{{ public_vip.ip }}"
-  when: compute_expansion
-
-- name: "make directory for ceph config file"
-  file: path="/etc/ceph" state="directory"
-
-- name: copy ceph conf to dest mon node
-  copy: src="/tmp/ceph.conf" dest="/etc/ceph/ceph.conf"
-
-- name: install ceph-related packages
-  action: "{{ ansible_pkg_mgr }} name={{ item }} state=present"
-  with_items:
-    - ceph
-
-- name: gen create monmap script
-  local_action: template src="create_monmap.j2" dest="/tmp/create_monmap.sh" mode=0755
-  when: inventory_hostname in groups['ceph_adm']
-
-- name: create monmap
-  script: /tmp/create_monmap.sh
-  when: inventory_hostname in groups['ceph_mon']
-
-- name: create mon.keyring
-  shell: "ceph-authtool --create-keyring /tmp/ceph.mon.keyring \
-             --gen-key -n mon. --cap mon 'allow *'"
-  when: inventory_hostname in groups['ceph_adm']
-
-- name: create admin.keyring
-  shell: "ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring \
-             --gen-key -n client.admin --set-uid=0 \
-             --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow'"
-  when: inventory_hostname in groups['ceph_adm']
-
-- name: Add the client.admin key to the ceph.mon.keyring
-  shell: "ceph-authtool /tmp/ceph.mon.keyring \
-             --import-keyring /etc/ceph/ceph.client.admin.keyring"
-  when: inventory_hostname in groups['ceph_adm']
-
-- name: fetch mon.keyring to local
-  fetch: src="/tmp/ceph.mon.keyring" dest="/tmp/ceph.mon.keyring" flat=yes
-  when: inventory_hostname in groups['ceph_adm']
-
-- name: fetch mon.keyring from ceph_adm
-  fetch: src="/tmp/ceph.mon.keyring" dest="/tmp/ceph.mon.keyring" flat=yes
-  delegate_to: "{{ public_vip.ip }}"
-  when: compute_expansion
-
-- name: fetch client.admin.keyring to local
-  fetch:
-    src: "/etc/ceph/ceph.client.admin.keyring"
-    dest: "/tmp/ceph.client.admin.keyring"
-    flat: "yes"
-  when: inventory_hostname in groups['ceph_adm']
-
-- name: fetch mon.keyring from ceph_adm
-  fetch:
-    src: "/etc/ceph/ceph.client.admin.keyring"
-    dest: "/tmp/ceph.client.admin.keyring"
-    flat: "yes"
-  delegate_to: "{{ public_vip.ip }}"
-  when: compute_expansion
-
-- name: copy mon.keyring to remote nodes
-  copy: src="/tmp/ceph.mon.keyring" dest="/tmp/ceph.mon.keyring"
-
-- name: copy admin.keyring to remote nodes
-  copy:
-    src: "/tmp/ceph.client.admin.keyring"
-    dest: "/etc/ceph/ceph.client.admin.keyring"
-
-- meta: flush_handlers
diff --git a/deploy/adapters/ansible/roles/ceph-config/tasks/main.yml b/deploy/adapters/ansible/roles/ceph-config/tasks/main.yml
deleted file mode 100755
index 49feab61..00000000
--- a/deploy/adapters/ansible/roles/ceph-config/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: create_config.yml
-  tags:
-    - ceph_config
-    - ceph_deploy
-    - ceph_mon
-- 
cgit 1.2.3-korg