From d158e53addc56a9f92ecf0947eda4110c23da8ee Mon Sep 17 00:00:00 2001
From: Yujun Zhang <zhang.yujunz@zte.com.cn>
Date: Tue, 25 Apr 2017 16:46:51 +0800
Subject: Organize common tasks under qtip-common role

Change-Id: I8592efdac7e6c2161eb7cb1b36d023697ebe7ad4
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
---
 resources/ansible_roles/inxi/meta/main.yml  | 14 ++++++++++++++
 resources/ansible_roles/inxi/tasks/main.yml | 10 ++--------
 2 files changed, 16 insertions(+), 8 deletions(-)
 create mode 100644 resources/ansible_roles/inxi/meta/main.yml

(limited to 'resources/ansible_roles/inxi')

diff --git a/resources/ansible_roles/inxi/meta/main.yml b/resources/ansible_roles/inxi/meta/main.yml
new file mode 100644
index 00000000..76f78a32
--- /dev/null
+++ b/resources/ansible_roles/inxi/meta/main.yml
@@ -0,0 +1,14 @@
+##############################################################################
+# 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: inxi }
diff --git a/resources/ansible_roles/inxi/tasks/main.yml b/resources/ansible_roles/inxi/tasks/main.yml
index e7ffd18c..d9dbf7ad 100644
--- a/resources/ansible_roles/inxi/tasks/main.yml
+++ b/resources/ansible_roles/inxi/tasks/main.yml
@@ -16,12 +16,6 @@
   command: inxi -b -c0 -n
   register: inxi_out
 
-- name: generating log filename
-  set_fact:
-    logfile: "{{ qtip_results }}/inxi.log"
-  tags:
-    - always
-
 - name: saving output to log
   copy:
     content: "{{ inxi_out.stdout }}"
@@ -52,7 +46,7 @@
       - '.+\sKernel:\s+(?P<kernel>.+)\sConsole'
       - '.+\s+HDD Total Size:\s+(?P<disk>.+)\s'
       - '.+\sproduct:\s+(?P<product>.+)\sv'
-    export_to: "{{ qtip_results }}/system_info.json"
+    dest: "{{ output }}/condition.json"
   register: system_info
   delegate_to: localhost
   tags:
@@ -61,7 +55,7 @@
 - name: create system information report
   template:
     src: system-info.j2
-    dest: "{{ qtip_results }}/system-info"
+    dest: "{{ output }}/report"
   delegate_to: localhost
   tags:
     - report
-- 
cgit 1.2.3-korg