From bb208192872c841cafdb27769f3680a56b18fa65 Mon Sep 17 00:00:00 2001
From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Sat, 22 Apr 2017 09:06:05 +0800
Subject: Rename folders

* copy -> defaults
* render -> custom
* roles -> ansible_roles

Change-Id: Ia96214691873f3bd8e6c5f9f433292fd912ac46e
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
---
 resources/roles/inxi/tasks/main.yml           | 51 ---------------------------
 resources/roles/inxi/templates/system-info.j2 | 16 ---------
 2 files changed, 67 deletions(-)
 delete mode 100644 resources/roles/inxi/tasks/main.yml
 delete mode 100644 resources/roles/inxi/templates/system-info.j2

(limited to 'resources/roles/inxi')

diff --git a/resources/roles/inxi/tasks/main.yml b/resources/roles/inxi/tasks/main.yml
deleted file mode 100644
index 66c83f9d..00000000
--- a/resources/roles/inxi/tasks/main.yml
+++ /dev/null
@@ -1,51 +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
-##############################################################################
-
-- name: install inxi - Command line system information script for console and IRC
-  package:
-    name: inxi
-    state: present
-
-- name: check hardware information with inxi
-  command: inxi -b -c0 -n
-  register: inxi_out
-
-# TODO(yujunz) normalize system information, test condition and performance metrics for future data mining
-# e.g. convert "2 Deca core Intel Xeon E5-2650 v3s (-HT-MCP-SMP-) speed/max: 1200/3000 MHz" to
-# ---
-# processor:
-#   id:
-#     vendor: Intel
-#     product_family: Xeon
-#     processor_number: E5-2650 v3s
-#   number_of_cores: 2
-#   number_of_threads: None # set `None` when data is not available
-#   base_frequency_mhz: 1200
-#   max_turbo_frequency_mhz: 3000
-#   cache_mb: None
-- name: collect system information from inxi
-  collect:
-    string: "{{ inxi_out.stdout }}"
-    patterns:
-      - '.+\s+Host:\s+(?P<hostname>.+)\sKernel'
-      - '.+\sMemory:\s+(?P<memory>.+MB)\s'
-      - '^CPU\(s\):\s+(?P<cpu>.+)'
-      - '.+\sDistro:\s+(?P<os>.+)'
-      - '.+\sKernel:\s+(?P<kernel>.+)\sConsole'
-      - '.+\s+HDD Total Size:\s+(?P<disk>.+)\s'
-      - '.+\sproduct:\s+(?P<product>.+)\sv'
-    dump: 'inix.log'
-  register: system_info
-
-- name: create system information report
-  template:
-    src: system-info.j2
-    dest: "{{ qtip_results }}/{{ inventory_hostname }}/system-info"
-  delegate_to: localhost
-  tags: [report]
diff --git a/resources/roles/inxi/templates/system-info.j2 b/resources/roles/inxi/templates/system-info.j2
deleted file mode 100644
index 305a2af2..00000000
--- a/resources/roles/inxi/templates/system-info.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-System Information from inxi
-============================
-
-{% for host in groups['compute'] %}
-{{ hostvars[host].ansible_hostname }}
------------------------------
-
-{{ ('CPU Brand', hostvars[host].system_info.cpu[0])|justify }}
-{{ ('Disk', hostvars[host].system_info.disk[0])|justify }}
-{{ ('Host Name', hostvars[host].system_info.hostname[0])|justify }}
-{{ ('Kernel', hostvars[host].system_info.kernel[0])|justify }}
-{{ ('Memory', hostvars[host].system_info.memory[0])|justify }}
-{{ ('Operating System', hostvars[host].system_info.os[0])|justify }}
-{{ ('Product', hostvars[host].system_info.product[0])|justify }}
-
-{% endfor %}
-- 
cgit 1.2.3-korg