openstack/bifrost
Code Issues Proposed changes

Finally fix jinja[spacing]

Browse Source 
Change-Id: Icc33cb4a96cca39bf9a813e2177a9a1d7f9a901c
This commit is contained in:
Riccardo Pittau
2023-02-03 10:39:49 +01:00
parent 0e6be25ee1
commit d4743bc1fd
11 changed files with 60 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
playbooks/roles/bifrost-create-dib-image/defaults/main.yml
View File

@@ -2,8 +2,8 @@
dib_os_element: "debian"
dib_init_element: "simple-init"
dib_env_vars:
http_proxy: "{{ lookup('env','http_proxy') }}"
https_proxy: "{{ lookup('env','https_proxy') }}"
http_proxy: "{{ lookup('env', 'http_proxy') }}"
https_proxy: "{{ lookup('env', 'https_proxy') }}"
DIB_INSTALLTYPE_simple_init: repo
DIB_INSTALLTYPE_pip_and_virtualenv: package
LANG: C

46
playbooks/roles/bifrost-create-dib-image/tasks/main.yml
View File

@@ -125,18 +125,18 @@
dib_env_vars_final: "{{ dib_env_vars | combine(dib_source_repositories) }}"
- name: "Set the DIB_RELEASE environment variable if set"
set_fact:
dib_env_vars_final: "{{ dib_env_vars_final | 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
- name: "Build ELEMENTS_PATH variable from IPA builder element folder"
set_fact:
dib_elements_path: "{{ [ ipa_builder_git_folder + '/dib' ] }}"
dib_elements_path: "{{ [ipa_builder_git_folder + '/dib'] }}"
- name: "Add existing ELEMENTS_PATH value if present"
set_fact:
dib_elements_path: "{{ dib_elements_path + [dib_env_vars_final['ELEMENTS_PATH']] }}"
when: "'ELEMENTS_PATH' in dib_env_vars_final"
- name: "Set the ELEMENTS_PATH environment variable"
set_fact:
dib_env_vars_final: "{{ dib_env_vars_final | combine({'ELEMENTS_PATH': dib_elements_path | join(':') }) }}"
dib_env_vars_final: "{{ dib_env_vars_final | combine({'ELEMENTS_PATH': dib_elements_path | join(':')}) }}"
- name: "Set the DIB_BLOCK_DEVICE_CONFIG variable if set"
set_fact:
dib_env_vars_final: "{{ dib_env_vars_final | combine({'DIB_BLOCK_DEVICE_CONFIG': dib_partitioning}) }}"
@@ -155,27 +155,27 @@
- 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_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('') }}
{{ dib_elements | default('') }}
- name: "Initiate image build"
command: disk-image-create {{ dib_arglist }}
environment: "{{ dib_env_vars_final | combine(bifrost_venv_env) }}"