diff options
| author |   Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-09-11 15:19:15 +0800 |
|---|---|---|
| committer | Yujun Zhang <zhang.yujunz@zte.com.cn> | 2017-09-15 05:48:37 +0000 |
| commit | 25086394f9ebd7bd90698ea54734f27ee9d4517e (patch) | |
| tree | cb4ceae1975eb46e291490198e9f7bc55b19e780 | |
| parent | 35710f44ea46f07471ff8636fa4a2b8f8de56632 (diff) | |
Fix output path
Change-Id: Ib3e5a310a561d9fdd11b503058ada4e937189a9d
Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
| -rw-r--r-- | resources/ansible_roles/ceph-info/tasks/cache.yml | 4 | ||||
| -rw-r--r-- | resources/ansible_roles/qtip-generator/files/storage/run.yml | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/resources/ansible_roles/ceph-info/tasks/cache.yml b/resources/ansible_roles/ceph-info/tasks/cache.yml index 7e29a325..a60c7c04 100644 --- a/resources/ansible_roles/ceph-info/tasks/cache.yml +++ b/resources/ansible_roles/ceph-info/tasks/cache.yml @@ -9,11 +9,11 @@ - fetch: src: /etc/ceph/ceph.conf - dest: "{{ qtip_results }}/sysinfo-{{ inventory_hostname }}/" + dest: "{{ output }}/" flat: yes - name: collect ceph catch info from ceph.conf - set_fact: {"{{ item }}":"{{ lookup('ini', '{{ item }} section=client default='' file={{ qtip_results }}/sysinfo-{{ inventory_hostname }}/ceph.conf') }}"} + set_fact: {"{{ item }}":"{{ lookup('ini', '{{ item }} section=client default='' file={{ output }}/ceph.conf') }}"} with_items: - rbd_cache - rbd_cache_max_dirty diff --git a/resources/ansible_roles/qtip-generator/files/storage/run.yml b/resources/ansible_roles/qtip-generator/files/storage/run.yml index 5fdf72f6..1ddf0b59 100644 --- a/resources/ansible_roles/qtip-generator/files/storage/run.yml +++ b/resources/ansible_roles/qtip-generator/files/storage/run.yml @@ -12,10 +12,10 @@ - hosts: localhost roles: - # prepare local environment - - { role: qtip, tasks: setup-local, tags: [setup] } - - storperf + - { role: qtip, tasks: setup-local, tags: [setup] } + - { role: storperf, output: "{% raw %}{{ qtip_results }}{% endraw %}/storperf" } - hosts: SUT roles: - - ceph-info + - { role: qtip, tasks: setup-node, tags: [setup] } + - { role: ceph-info, output: "{% raw %}{{ qtip_results }}{% endraw %}/ceph-info" } |