diff options
| author |   Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-04-25 16:46:51 +0800 |
|---|---|---|
| committer | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-04-25 16:58:31 +0800 |
| commit | d158e53addc56a9f92ecf0947eda4110c23da8ee (patch) | |
| tree | ce0bbffe52abe0b2e0bc91f6cc9638ed1477e413 /resources/ansible_roles/inxi | |
| parent | 2189e3bfdf1d250fa1201f89249745d4d6aab7f0 (diff) | |
Organize common tasks under qtip-common role
Change-Id: I8592efdac7e6c2161eb7cb1b36d023697ebe7ad4
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'resources/ansible_roles/inxi')
| -rw-r--r-- | resources/ansible_roles/inxi/meta/main.yml | 14 | ||||
| -rw-r--r-- | resources/ansible_roles/inxi/tasks/main.yml | 10 |
2 files changed, 16 insertions, 8 deletions
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 |