From 356ce0e9c2174a3f73fedaf618bd9b699ec27696 Mon Sep 17 00:00:00 2001 From: Yolanda Robla Mota Date: Tue, 15 Nov 2016 11:14:02 +0100 Subject: [PATCH] Create new fact for dib_env_vars When joining DIB_RELEASE in dib_env_vars, it was not picking the new value properly, still relying on previously registered fact before merge. Use a different fact name, to ensure that the whole env values are picked properly. Change-Id: Ic1a9a7a00943792fafb16892b3b3a6fe9d3c0d54 --- playbooks/roles/bifrost-create-dib-image/tasks/main.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/roles/bifrost-create-dib-image/tasks/main.yml b/playbooks/roles/bifrost-create-dib-image/tasks/main.yml index 066b14f31..8834e7906 100644 --- a/playbooks/roles/bifrost-create-dib-image/tasks/main.yml +++ b/playbooks/roles/bifrost-create-dib-image/tasks/main.yml @@ -110,18 +110,18 @@ when: dib_os_element == "debian" and dib_os_release is undefined - name: "Set the DIB_RELEASE environment variable if set" set_fact: - dib_env_vars: "{{dib_env_vars | combine({'DIB_RELEASE':dib_os_release}) }}" + dib_env_vars_final: "{{dib_env_vars | combine({'DIB_RELEASE':dib_os_release}) }}" when: dib_os_release is defined - name: "Build argument list" set_fact: dib_arglist: "{{dib_trace_arg|default('')}} {{dib_uncompressed_arg|default('')}} {{dib_clearenv_arg|default('')}} {{dib_notmpfs_arg|default('')}} {{dib_offline_arg|default('')}} {{dib_skipbase_arg|default('')}} {{dib_arch_arg|default('')}} {{dib_imagename_arg|default('')}} {{dib_imagetype_arg|default('')}} {{dib_imagesize_arg|default('')}} {{dib_imagecache_arg|default('')}} {{dib_maxresize_arg|default('')}} {{dib_mintmpfs_arg|default('')}} {{dib_mkfsopts_arg|default('')}} {{dib_qemuopts_arg|default('')}} {{dib_rootlabel_arg|default('')}} {{dib_rdelement_arg|default('')}} {{dib_installtype_arg|default('')}} {{dib_packages_arg|default('')}} {{dib_os_element}} {{dib_elements|default('')}}" - name: "Initiate image build" command: disk-image-create {{dib_arglist}} - environment: "{{ dib_env_vars }}" + environment: "{{ dib_env_vars_final }}" when: build_ramdisk | bool == false and test_image_present.stat.exists == false and test_image_dib_present.stat.exists == false and test_image_initramfs_present.stat.exists == false - name: "Initiate ramdisk build" command: ramdisk-image-create {{dib_arglist}} - environment: "{{ dib_env_vars }}" + environment: "{{ dib_env_vars_final }}" when: build_ramdisk | bool == true and test_image_present.stat.exists == false and test_image_dib_present.stat.exists == false and test_image_initramfs_present.stat.exists == false - name: "Update permission of generated image" file: