diff options
| author |   Ross Brattain <ross.b.brattain@intel.com> | 2017-08-25 20:00:13 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-08-25 20:00:13 +0000 |
| commit | afd31c1c34ef66f23e17bbdb2316e7f4bc1bf7ec (patch) | |
| tree | d7d1da145d0c0b39fec04b1a06a173a8573c3920 /ansible/roles/download_samplevnfs | |
| parent | 15f6586bf0d2ed6b3f03dc3574a4dff5d9a3c64e (diff) | |
| parent | 1d91850970f89ff6b383c26a1cf9fbc5e9ac78eb (diff) | |
Merge "ansible: update dpdk, trex and samplevnf install"
Diffstat (limited to 'ansible/roles/download_samplevnfs')
| -rw-r--r-- | ansible/roles/download_samplevnfs/defaults/main.yml | 8 | ||||
| -rw-r--r-- | ansible/roles/download_samplevnfs/tasks/main.yml | 17 |
2 files changed, 10 insertions, 15 deletions
diff --git a/ansible/roles/download_samplevnfs/defaults/main.yml b/ansible/roles/download_samplevnfs/defaults/main.yml index 44449af6f..5f565a415 100644 --- a/ansible/roles/download_samplevnfs/defaults/main.yml +++ b/ansible/roles/download_samplevnfs/defaults/main.yml @@ -1,6 +1,4 @@ --- -samplevnf_version: "" -samplevnf_file: "{{ samplevnf_url|basename }}" -samplevnf_unarchive: "{{ samplevnf_file|regex_replace('[.]tar[.]gz$', '') }}" -samplevnf_dest: "{{ clone_dest }}/" -samplevnf_sha256: "sha256:36457cadfd23053c9ce1cf2e6f048cad6a5d04a7371d7a122e133dcbf007989e" +samplevnf_url: "https://git.opnfv.org/samplevnf" +samplevnf_dest: "{{ clone_dest }}/samplevnf" +samplevnf_version: "master" diff --git a/ansible/roles/download_samplevnfs/tasks/main.yml b/ansible/roles/download_samplevnfs/tasks/main.yml index 005d57dda..e9d4142c9 100644 --- a/ansible/roles/download_samplevnfs/tasks/main.yml +++ b/ansible/roles/download_samplevnfs/tasks/main.yml @@ -17,16 +17,13 @@ # verbosity: 2 - name: fetch samplevnf - get_url: - url: "{{ samplevnf_url }}" + git: + repo: "{{ samplevnf_url }}" dest: "{{ samplevnf_dest }}" - validate_certs: False - checksum: "{{ samplevnf_sha256 }}" - -- unarchive: - src: "{{ clone_dest }}/{{ samplevnf_file }}" - dest: "{{ clone_dest }}/" - copy: no + version: "{{ samplevnf_version }}" + accept_hostkey: yes + recursive: no + force: yes - set_fact: - samplevnf_path: "{{ clone_dest }}/{{ samplevnf_unarchive }}" + samplevnf_path: "{{ samplevnf_dest }}" |