Merge "Fix image creation when dib_os_release not defined"

This commit is contained in:
Jenkins 2017-02-21 17:24:04 +00:00 committed by Gerrit Code Review
commit c3b9574c63

View File

@ -108,9 +108,12 @@
set_fact: set_fact:
dib_os_release: "jessie" dib_os_release: "jessie"
when: dib_os_element == "debian" and dib_os_release is undefined when: dib_os_element == "debian" and dib_os_release is undefined
- name: "Initialize the DIB environment variables fact"
set_fact:
dib_env_vars_final: "{{dib_env_vars}}"
- name: "Set the DIB_RELEASE environment variable if set" - name: "Set the DIB_RELEASE environment variable if set"
set_fact: set_fact:
dib_env_vars_final: "{{dib_env_vars | combine({'DIB_RELEASE':dib_os_release}) }}" dib_env_vars_final: "{{dib_env_vars_final | combine({'DIB_RELEASE':dib_os_release}) }}"
when: dib_os_release is defined when: dib_os_release is defined
- name: "Build argument list" - name: "Build argument list"
set_fact: set_fact: