Ansible typo fix, whitespace

Change-Id: I3639ab84ab5b9e802e1bbd23674b0fbda46fdc66
Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>

diff --git a/ansible/build_yardstick_image.yml b/ansible/build_yardstick_image.yml
index 49dc3e2..9a65d3a 100644 (file)
--- a/ansible/build_yardstick_image.yml
+++ b/ansible/build_yardstick_image.yml
@@ -35,6 +35,7 @@
     raw_imgfile: "{{ workspace }}/{{ raw_imgfile_basename }}"
   environment:
     PATH: /usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/root/bin
+
   tasks:
     - group_by:
         key: image_builder

diff --git a/ansible/library/my_make.py b/ansible/library/my_make.py
index a88053b..3524085 100644 (file)
--- a/ansible/library/my_make.py
+++ b/ansible/library/my_make.py
@@ -135,4 +135,3 @@ from ansible.module_utils.basic import *
 
 if __name__ == '__main__':
     main()
-

diff --git a/ansible/roles/install_dpdk/vars/main.yml b/ansible/roles/install_dpdk/vars/main.yml
index a226045..730215c 100644 (file)
--- a/ansible/roles/install_dpdk/vars/main.yml
+++ b/ansible/roles/install_dpdk/vars/main.yml
@@ -6,4 +6,3 @@ dpdk_devbind:
   "16.07": "{{ dpdk_path }}/tools/dpdk-devbind.py"
   "17.02": "{{ dpdk_path }}/usertools/dpdk-devbind.py"
   "17.04": "{{ dpdk_path }}/usertools/dpdk-devbind.py"
->>>>>>> 1f587bb... DRAFT: yardstick setup ansible, including load_images