From 1d91850970f89ff6b383c26a1cf9fbc5e9ac78eb Mon Sep 17 00:00:00 2001 From: Ross Brattain Date: Fri, 18 Aug 2017 13:36:02 -0700 Subject: ansible: update dpdk, trex and samplevnf install we now clone samplevnf from git repo made install_samplevnf role that takes as parameter VNF name added ubuntu_server_cloudimg_modify_samplevnfs playbook Change-Id: I5724e3b844b3137542a5c293516893a5c80f5c61 Signed-off-by: Ross Brattain --- ansible/roles/download_samplevnfs/defaults/main.yml | 8 +++----- ansible/roles/download_samplevnfs/tasks/main.yml | 17 +++++++---------- 2 files changed, 10 insertions(+), 15 deletions(-) (limited to 'ansible/roles/download_samplevnfs') 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 }}" -- cgit 1.2.3-korg