From 43501355cf6974ee9ee36ca22c1113d80acffc7d Mon Sep 17 00:00:00 2001
From: "wu.zhihui" <wu.zhihui1@zte.com.cn>
Date: Fri, 9 Sep 2016 13:16:09 +0800
Subject: ansible playbook bugfix

According the qtip ci results, make these bugfixs.
1. skipping: no hosts matched
   This used to work in Ansible 1.9.x with 127.0.0.1;But does not work in Asible 2.x
   solved: add 127.0.0.1 as localhost in ./data/hosts
2. Using bare variables is deprecated.
   solved: update playbook
3. use git module
4. To save time, turning Off Facts on localhost.

Since https://gerrit.opnfv.org/gerrit/#/c/20661/ is under codereview,
for qtip ci job, I temporarily modify function write_to_file() in
env_setup.py.

Change-Id: I71a08ebf87cd8c8d851a3f8f760e29e8725f0e0f
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>
---
 benchmarks/playbooks/ssl.yaml | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

(limited to 'benchmarks/playbooks/ssl.yaml')

diff --git a/benchmarks/playbooks/ssl.yaml b/benchmarks/playbooks/ssl.yaml
index fcb7585c..55e0af9b 100644
--- a/benchmarks/playbooks/ssl.yaml
+++ b/benchmarks/playbooks/ssl.yaml
@@ -1,15 +1,20 @@
- - hosts: 127.0.0.1
+ - hosts: localhost
    connection: local
+   gather_facts: no
+
    tasks:
     - name: making ssl directory
       file: path={{workingdir}}/{{Dest_dir}}/ssl state=directory
+
     - name: making temporary ssl directory
       file: path={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp state=directory
+
  - hosts: "{{role}}"
    become: yes
    remote_user: "{{username}}"
+
    tasks:
-    - name: checking_home directory
+    - name: checking home directory
       shell: sudo echo $HOME
       register: home_dir
 
@@ -32,11 +37,11 @@
           network: false
 
     - name: Installing OpenSSL dependencies when CentOS
-      shell: sudo yum install git  wget gcc patch  perl-Time-HiRes autofconf automake libpcap-devel libtool -y
+      shell: sudo yum install git wget gcc patch perl-Time-HiRes autofconf automake libpcap-devel libtool -y
       when: ansible_os_family == "RedHat"
 
     - name: Installing OpenSSL dependencies when Ubuntu
-      shell: sudo apt-get  install git gcc wget   perl autoconf automake libpcap-dev libtool -y
+      shell: sudo apt-get install git gcc wget  perl autoconf automake libpcap-dev libtool -y
       when: ansible_os_family == "Debian"
 
     - name: Fetching OpenSSL
@@ -59,7 +64,6 @@
     - name: Benchmaring AES-128-cbc cipher encryption  throughput
       shell: cd $HOME/Open_SSL/openssl-1.0.2f/apps  &&  sudo ./openssl speed -evp aes-128-cbc >> $HOME/qtip_result/AES-128-CBC_dump
 
-
     - name: Fetching result transformation script
       copy: src=./result_transform/ssl/ssl_transform.py dest={{home_dir.stdout}}/qtip_result
 
@@ -78,7 +82,7 @@
 
     - name: copy results
       fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp
-      with_items: files_to_copy.stdout_lines
+      with_items: "{{files_to_copy.stdout_lines}}"
 
     - name: registering log files
       shell: (cd $HOME/qtip_result/; find . -maxdepth 1 -name "*.log") | cut -d'/' -f2
@@ -86,19 +90,24 @@
 
     - name: copying log results
       fetch:  src={{home_dir.stdout}}/qtip_result/{{item}} dest={{workingdir}}/{{Dest_dir}}/ssl/ssl_temp
-      with_items: copy_log_results.stdout_lines
-
+      with_items: "{{copy_log_results.stdout_lines}}"
 
- - hosts: 127.0.0.1
+ - hosts: localhost
    connection: local
+   gather_facts: no
+
    tasks:
     - name: echo
       shell: echo $PWD
+
     - name: extracting_json
       shell: ( find {{workingdir}}/{{Dest_dir}}/ssl/ssl_temp/ -name "*.json" | xargs cp -t {{workingdir}}/{{Dest_dir}}/ssl/)
+
     - name: making_logs_folder
       shell: mkdir -p {{workingdir}}/{{Dest_dir}}/ssl/logs
+
     - name: extracting_log
       shell: ( find {{workingdir}}/{{Dest_dir}}/ssl/ssl_temp/ -name "*.log"  | xargs cp -t {{workingdir}}/{{Dest_dir}}/ssl/logs)
+
     - name: removing ssl_temp
       shell: rm -rf {{workingdir}}/{{Dest_dir}}/ssl/ssl_temp
-- 
cgit 1.2.3-korg