summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2017-09-21 07:59:07 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-09-21 07:59:07 +0000
commit0afcb901da65e76f42d908633d84a7e408c1d8a0 (patch)
tree25d04dcd226b96114a80e045c7dc0227c22ffaa7
parent1b7b1ceac943b93bbc5a5508195a6937a8756553 (diff)
parentff8ce9160d03f468a09aea220afb7ad5a5af3b58 (diff)
Merge "Fix output path of testing results" into stable/euphrates
-rw-r--r--resources/ansible_roles/ceph-info/tasks/network.yml4
-rw-r--r--resources/ansible_roles/qtip-generator/files/storage/run.yml2
2 files changed, 3 insertions, 3 deletions
diff --git a/resources/ansible_roles/ceph-info/tasks/network.yml b/resources/ansible_roles/ceph-info/tasks/network.yml
index d5319c55..4ec7b562 100644
--- a/resources/ansible_roles/ceph-info/tasks/network.yml
+++ b/resources/ansible_roles/ceph-info/tasks/network.yml
@@ -20,11 +20,11 @@
- fetch:
src: /etc/ceph/ceph.conf
- dest: "{{ qtip_results }}/sysinfo-{{ inventory_hostname }}/"
+ dest: "{{ output }}/"
flat: yes
- name: collect ceph system info from ceph.conf
- set_fact: {"{{ item }}":"{{ lookup('ini', '{{ item }} section=global default='' file={{ qtip_results }}/sysinfo-{{ inventory_hostname }}/ceph.conf') }}"}
+ set_fact: {"{{ item }}":"{{ lookup('ini', '{{ item }} section=global default='' file={{ output }}/ceph.conf') }}"}
with_items:
- cluster_network
delegate_to: localhost
diff --git a/resources/ansible_roles/qtip-generator/files/storage/run.yml b/resources/ansible_roles/qtip-generator/files/storage/run.yml
index 1ddf0b59..ee605f11 100644
--- a/resources/ansible_roles/qtip-generator/files/storage/run.yml
+++ b/resources/ansible_roles/qtip-generator/files/storage/run.yml
@@ -13,7 +13,7 @@
roles:
- { role: qtip, tasks: setup-local, tags: [setup] }
- - { role: storperf, output: "{% raw %}{{ qtip_results }}{% endraw %}/storperf" }
+ - { role: storperf, output: "{% raw %}{{ qtip_results }}{% endraw %}/current/storperf" }
- hosts: SUT
roles: