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/openssl | |
| 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/openssl')
| -rw-r--r-- | resources/ansible_roles/openssl/meta/main.yml | 14 | ||||
| -rw-r--r-- | resources/ansible_roles/openssl/tasks/main.yml | 10 |
2 files changed, 19 insertions, 5 deletions
diff --git a/resources/ansible_roles/openssl/meta/main.yml b/resources/ansible_roles/openssl/meta/main.yml new file mode 100644 index 00000000..d7c4381a --- /dev/null +++ b/resources/ansible_roles/openssl/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: openssl } diff --git a/resources/ansible_roles/openssl/tasks/main.yml b/resources/ansible_roles/openssl/tasks/main.yml index 91c5be93..0d57ef2d 100644 --- a/resources/ansible_roles/openssl/tasks/main.yml +++ b/resources/ansible_roles/openssl/tasks/main.yml @@ -23,8 +23,8 @@ - name: generating log filename set_fact: - rsa_logfile: "{{ qtip_results }}/openssl_rsa.log" - aes_logfile: "{{ qtip_results }}/openssl_aes.log" + rsa_logfile: "{{ output }}/openssl-rsa.log" + aes_logfile: "{{ output }}/openssl-aes.log" tags: always # TODO(yujunz) `delegate_to` not working under `with_items` @@ -60,7 +60,7 @@ ^rsa\s+4096\sbits\s.+\s+ ?(?P<rsa_sign_4096>\d+\.\d)\s+ ?(?P<rsa_verify_4096>\d+\.\d)$ - export_to: "{{ qtip_results }}/ssl_rsa_metrics.json" + dest: "{{ output }}/rsa-metrics.json" register: ssl_rsa_metrics tags: collect @@ -75,13 +75,13 @@ ?(?P<aes_128_cbc_256_bytes>\d+\.\w+)\s+ ?(?P<aes_128_cbc_1024_bytes>\d+\.\w+)\s+ ?(?P<aes_128_cbc_8192_bytes>\d+\.\w+)$ - export_to: "{{ qtip_results }}/ssl_aes_metrics.json" + dest: "{{ output }}/aes-metrics.json" register: ssl_aes_metrics tags: collect - name: create SSL report template: src: ssl-metrics.j2 - dest: "{{ qtip_results }}/ssl-metrics" + dest: "{{ output }}/ssl-metrics" delegate_to: localhost tags: report |