openstack/tripleo-quickstart-extras
Code Issues Proposed changes

Merge "Reset virt-customize args at the beginning of the role"

Browse Source
This commit is contained in:
Jenkins 2017-03-02 13:44:38 +00:00 committed by Gerrit Code Review
commit 77b5f1f582
2 changed files with 11 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
roles/modify-image/defaults/main.yml
View File

@ -18,13 +18,6 @@ modify_image_install_packages: []
# By default we use the global working directory for modifying images
modify_image_working_dir: "{{ working_dir }}"
# virt-customize defaults
# vc_args can be used to pass any arbitrary arguments to virt-customize
vc_args: ""
# the other "vc" vars below are converted to the correct virt-customize args,
# and are provided for convenience.
# ram and cpu are not set by default to take libguestfs defaults by default
# modify_image_vc_ram:
# modify_image_vc_cpu:

19
roles/modify-image/tasks/main.yml
View File

@ -11,37 +11,40 @@
yum: name=libguestfs-tools-c state=latest
become: true
- name: virt-customize args --> reset private var
set_fact: _vc_args=""
- name: virt-customize args --> memory
set_fact: vc_args="{{ vc_args }} -m {{ modify_image_vc_ram }}"
set_fact: _vc_args="{{ _vc_args }} -m {{ modify_image_vc_ram }}"
when: modify_image_vc_ram is defined
- name: virt-customize args --> cpu
set_fact: vc_args="{{ vc_args }} --smp {{ modify_image_vc_cpu }}"
set_fact: _vc_args="{{ _vc_args }} --smp {{ modify_image_vc_cpu }}"
when: modify_image_vc_cpu is defined
- name: virt-customize args --> verbose output
set_fact: vc_args="{{ vc_args }} -v"
set_fact: _vc_args="{{ _vc_args }} -v"
when: modify_image_vc_verbose|bool
- name: virt-customize args --> trace/debug output
set_fact: vc_args="{{ vc_args }} -x"
set_fact: _vc_args="{{ _vc_args }} -x"
when: modify_image_vc_trace|bool
- name: virt-customize args --> upload files
set_fact: vc_args="{{ vc_args }} --upload {{ item.src }}:{{ item.dest }}"
set_fact: _vc_args="{{ _vc_args }} --upload {{ item.src }}:{{ item.dest }}"
with_items: "{{ modify_image_upload_files }}"
- name: virt-customize args --> install packages
set_fact: vc_args="{{ vc_args }} --install {{ modify_image_install_packages|join(",") }}"
set_fact: _vc_args="{{ _vc_args }} --install {{ modify_image_install_packages|join(",") }}"
when: modify_image_install_packages
- name: virt-customize args --> modify script
set_fact: vc_args="{{ vc_args }} --run {{ modify_script }}"
set_fact: _vc_args="{{ _vc_args }} --run {{ modify_script }}"
when: modify_script is defined
- name: Run virt-customize on the provided image
shell: >
virt-customize {{ vc_args }}
virt-customize {{ _vc_args }}
-a {{ image_to_modify }}
> {{ modify_script|default('modify_image') }}.log 2>&1
environment: