diff options
| author |   Emma Foley <emma.l.foley@intel.com> | 2018-04-11 13:25:56 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-04-11 13:25:56 +0000 |
| commit | d2e5307fed153989558aa9506f33e69c74d29675 (patch) | |
| tree | 7c2ae0946eb45a07d71e0aaea2984d24890be837 /ansible/roles/install_dpdk | |
| parent | ead90064d12be552bd334828d41ffffa75fad01b (diff) | |
| parent | a78a2979e872c64800f77683f1bf3b0162b87715 (diff) | |
Merge "Add support for dpdk 17.05"
Diffstat (limited to 'ansible/roles/install_dpdk')
| -rw-r--r-- | ansible/roles/install_dpdk/tasks/main.yml | 2 | ||||
| -rw-r--r-- | ansible/roles/install_dpdk/vars/main.yml | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/ansible/roles/install_dpdk/tasks/main.yml b/ansible/roles/install_dpdk/tasks/main.yml index e82ad8363..5bcfb50b1 100644 --- a/ansible/roles/install_dpdk/tasks/main.yml +++ b/ansible/roles/install_dpdk/tasks/main.yml @@ -116,7 +116,7 @@ - name: copy dpdk-devbind.py to correct location copy: - src: "{{ dpdk_devbind[dpdk_version] }}" + src: "{{ dpdk_devbind_usertools if dpdk_version|float >= 17.02 else dpdk_devbind_tools }}" dest: "{{ INSTALL_BIN_PATH }}/dpdk-devbind.py" remote_src: yes force: yes diff --git a/ansible/roles/install_dpdk/vars/main.yml b/ansible/roles/install_dpdk/vars/main.yml index 45bcc339b..5dec63776 100644 --- a/ansible/roles/install_dpdk/vars/main.yml +++ b/ansible/roles/install_dpdk/vars/main.yml @@ -2,8 +2,6 @@ dpdk_make_arch: x86_64-native-linuxapp-gcc dpdk_module_dir: "/lib/modules/{{ dpdk_kernel }}/extra" hugetable_mount: /mnt/huge -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" +dpdk_devbind_tools: "{{ dpdk_path }}/tools/dpdk-devbind.py" +dpdk_devbind_usertools: "{{ dpdk_path }}/usertools/dpdk-devbind.py" dpdk_pmd_path: /usr/lib/dpdk-pmd/ |