summaryrefslogtreecommitdiffstats
path: root/resources/ansible_roles
diff options
context:
space:
mode:
authorYujun Zhang <zhang.yujunz@zte.com.cn>2017-04-26 09:09:48 +0800
committerYujun Zhang <zhang.yujunz@zte.com.cn>2017-04-26 09:09:48 +0800
commit0c10841189cee0eab2dcd0a18ab946bb3ae617a0 (patch)
tree6de609fe4cdfbe5778cde99df1f2bb35968b6477 /resources/ansible_roles
parente6da6749be6e5143855a48c866de2cd03789d2e8 (diff)
Include memory metrics to calculation
Change-Id: Iaf67cc53d7c95a4f3527000e479936a57a4c41cc Signed-off-by: Yujun Zhang <zhang.yujunz@zte.com.cn>
Diffstat (limited to 'resources/ansible_roles')
-rw-r--r--resources/ansible_roles/qtip/tasks/calculate.yml2
-rw-r--r--resources/ansible_roles/ramspeed/tasks/main.yml3
2 files changed, 5 insertions, 0 deletions
diff --git a/resources/ansible_roles/qtip/tasks/calculate.yml b/resources/ansible_roles/qtip/tasks/calculate.yml
index b00707ed..e4107e4d 100644
--- a/resources/ansible_roles/qtip/tasks/calculate.yml
+++ b/resources/ansible_roles/qtip/tasks/calculate.yml
@@ -15,6 +15,8 @@
ssl_rsa: "{{ ssl_rsa_metrics }}"
ssl_aes: "{{ ssl_aes_metrics }}"
dpi_throughput: "{{ dpi_metrics }}"
+ intmem: "{{ intmem_metrics }}"
+ floatmem: "{{ floatmem_metrics }}"
spec: "{{ qtip_resources }}/QPI/compute.yaml"
dest: "{{ qtip_results }}/compute.json"
register: qpi_result
diff --git a/resources/ansible_roles/ramspeed/tasks/main.yml b/resources/ansible_roles/ramspeed/tasks/main.yml
index 34b38fa1..dbf16567 100644
--- a/resources/ansible_roles/ramspeed/tasks/main.yml
+++ b/resources/ansible_roles/ramspeed/tasks/main.yml
@@ -47,6 +47,7 @@
set_fact:
int_logfile: "{{ output }}/ramsmp-int.log"
float_logfile: "{{ output }}/ramsmp-float.log"
+ tags: always
- name: saving integer output to log
copy:
@@ -71,6 +72,7 @@
- '^INTEGER\s+BatchRun\s+AVERAGE:\s+?(?P<average>\d+\.\d+)\sMB/s$'
dest: "{{ output }}/integer-metrics.json"
register: intmem_metrics
+ tags: collect
- name: collect float memory metrics from ramspeed
collect:
@@ -83,6 +85,7 @@
- '^FL-POINT\s+BatchRun\s+AVERAGE:\s+?(?P<average>\d+\.\d+)\sMB/s$'
dest: "{{ output }}/float-metrics.json"
register: floatmem_metrics
+ tags: collect
- name: create memory metrics report
template: