summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Brattain <ross.b.brattain@intel.com>2017-03-15 11:50:29 -0700
committerRoss Brattain <ross.b.brattain@intel.com>2017-08-14 23:27:23 +0000
commit029bbae1bd73dd50e146d069c6080cd0f0064126 (patch)
tree478d0a153b85d62b79a5c8d3f4b2de80762a2957
parenta4d2958ddb727c2aaf46956cbdbf7718bfd0be89 (diff)
Ansible typo fix, whitespace
Change-Id: I3639ab84ab5b9e802e1bbd23674b0fbda46fdc66 Signed-off-by: Ross Brattain <ross.b.brattain@intel.com>
-rw-r--r--ansible/build_yardstick_image.yml1
-rw-r--r--ansible/library/my_make.py1
-rw-r--r--ansible/roles/install_dpdk/vars/main.yml1
3 files changed, 1 insertions, 2 deletions
diff --git a/ansible/build_yardstick_image.yml b/ansible/build_yardstick_image.yml
index 49dc3e2b7..9a65d3ae0 100644
--- 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 a88053bcc..35240851c 100644
--- 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 a226045f5..730215c90 100644
--- 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