From ff4ceec2efd42fb1573e4faf4fe1840121e99715 Mon Sep 17 00:00:00 2001 From: Ace Lee Date: Mon, 4 Dec 2017 09:07:14 +0000 Subject: ansible image build improvement JIRA: YARDSTICK-879 Add some image build vars Add automatic image build of nsb yardstick_image: ansible-playbook -e img_property="normal" -vvv -i inventory.ini build_yardstick_image.yml nsb_image_build: ansible-playbook -e img_property="nsb" -vvv -i inventory.ini build_yardstick_image.yml prepare for yardstick image uploading Change-Id: I9fdf30084511ca9a008df3b53887b06273bbd549 Signed-off-by: Ace Lee --- ansible/build_yardstick_image.yml | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) (limited to 'ansible/build_yardstick_image.yml') diff --git a/ansible/build_yardstick_image.yml b/ansible/build_yardstick_image.yml index 45ef94e98..7f709873e 100644 --- a/ansible/build_yardstick_image.yml +++ b/ansible/build_yardstick_image.yml @@ -41,7 +41,12 @@ - package: name=parted state=present - set_fact: - imgfile: "{{ workspace }}/yardstick-image.img" + imgfile: "{{ normal_image_file }}" + when: img_property == "normal" + + - set_fact: + imgfile: "{{ nsb_image_file }}" + when: img_property == "nsb" - set_fact: mountdir: "{{ lookup('env', 'mountdir')|default('/mnt/yardstick', true) }}" @@ -197,8 +202,13 @@ nameserver_ip: "{{ ansible_dns.nameservers[0] }}" image_type: vm -- name: include {{ img_modify_playbook }} - include: "{{ img_modify_playbook }}" +- name: include ubuntu_server_cloudimg_modify.yml + include: ubuntu_server_cloudimg_modify.yml + when: img_property == "normal" + +- name: include ubuntu_server_cloudimg_modify_samplevnfs.yml + include: ubuntu_server_cloudimg_modify_samplevnfs.yml + when: img_property == "nsb" - hosts: localhost tasks: -- cgit 1.2.3-korg