Merge ceph info roles

Change-Id: I83be70cf24be2a9da0a0f82e44810b1e9ff2b3b8
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>

6 files changed, 6 insertions, 20 deletions

diff --git a/resources/ansible_roles/ceph-disk-info/meta/main.yml b/resources/ansible_roles/ceph-disk-info/meta/main.yml
deleted file mode 100644
index dbfbfb3b..00000000
--- a/resources/ansible_roles/ceph-disk-info/meta/main.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-##############################################################################
-# Copyright (c) 2017 ZTE Corporation 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
-##############################################################################
-
----
-
-allow_duplicates: yes
-dependencies:
-        - { role: qtip-common, basename: ceph-disk-info }
diff --git a/resources/ansible_roles/ceph-cache-info/meta/main.yml b/resources/ansible_roles/ceph-info/meta/main.yml
index 29b2992e..9b18b279 100644
--- a/resources/ansible_roles/ceph-cache-info/meta/main.yml
+++ b/resources/ansible_roles/ceph-info/meta/main.yml
@@ -11,4 +11,4 @@
 
 allow_duplicates: yes
 dependencies:
-- { role: qtip-common, basename: ceph-cache-info }
+- { role: qtip-common, basename: ceph-info }
diff --git a/resources/ansible_roles/ceph-cache-info/tasks/main.yml b/resources/ansible_roles/ceph-info/tasks/cache.yml
index 7e29a325..7e29a325 100644
--- a/resources/ansible_roles/ceph-cache-info/tasks/main.yml
+++ b/resources/ansible_roles/ceph-info/tasks/cache.yml
diff --git a/resources/ansible_roles/ceph-disk-info/tasks/main.yml b/resources/ansible_roles/ceph-info/tasks/disk.yml
index 6bb88e69..6bb88e69 100644
--- a/resources/ansible_roles/ceph-disk-info/tasks/main.yml
+++ b/resources/ansible_roles/ceph-info/tasks/disk.yml
diff --git a/resources/ansible_roles/ceph-network-info/meta/main.yml b/resources/ansible_roles/ceph-info/tasks/main.yml
index 4f5b88d4..04cc859c 100644
--- a/resources/ansible_roles/ceph-network-info/meta/main.yml
+++ b/resources/ansible_roles/ceph-info/tasks/main.yml
@@ -9,6 +9,6 @@
 
 ---
 
-allow_duplicates: yes
-dependencies:
-  - { role: qtip-common, basename: ceph-network-info }
+- include: cache.yml
+- include: disk.yml
+- include: network.yml
diff --git a/resources/ansible_roles/ceph-network-info/tasks/main.yml b/resources/ansible_roles/ceph-info/tasks/network.yml
index 7216d1a5..d5319c55 100644
--- a/resources/ansible_roles/ceph-network-info/tasks/main.yml
+++ b/resources/ansible_roles/ceph-info/tasks/network.yml
@@ -9,7 +9,7 @@
 
 
 - name: get system network info
-  shell: netstat -nr |grep  "U" | awk '{printf "interface %s network %s mask  %s \n",$8,$1, $3 }' 
+  shell: netstat -nr |grep  "U" | awk '{printf "interface %s network %s mask  %s \n",$8,$1, $3 }'
   register: ceph_network_out
 
 - name: saving output to log
@@ -29,7 +29,7 @@
       - cluster_network
   delegate_to: localhost
 
-- name: append 
+- name: append
   lineinfile:
       dest: "{{ logfile }}"
       line: "cluster_network {{ cluster_network }}"