Finally fix jinja[spacing]
Change-Id: Icc33cb4a96cca39bf9a813e2177a9a1d7f9a901c
This commit is contained in:
Riccardo Pittau
parent
0e6be25ee1
commit
d4743bc1fd
|
|
@ -4,7 +4,6 @@ skip_list:
|
|||
- fqcn[action-core] # Use FQCN for builtin actions
|
||||
- ignore-errors # Use failed_when and specify error conditions instead of using ignore_errors
|
||||
- jinja[invalid] # Unrecognized type
|
||||
- jinja[spacing] # Jinja2 spacing could be improved
|
||||
- key-order[task] # You can improve the task key order
|
||||
- meta-no-info # meta/main.yml should contain relevant info
|
||||
- meta-no-tags # Tags must contain lowercase letters and digits only
|
||||
|
|
|
|||
|
|
@ -41,4 +41,4 @@
|
|||
|
||||
- name: "Read SSH public key in ssh_public_key"
|
||||
set_fact:
|
||||
ssh_public_key: "{{ lookup('file', ssh_public_key_path ) }}"
|
||||
ssh_public_key: "{{ lookup('file', ssh_public_key_path) }}"
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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) }}"
|
||||
|
|
|
|||
|
|
@ -74,8 +74,8 @@ ipxe_efi_binary: ipxe.efi
|
|||
|
||||
tarballs_base_url: "https://tarballs.opendev.org/openstack/ironic-python-agent"
|
||||
ipa_download_headers: {}
|
||||
ipa_kernel: "{{http_boot_folder}}/ipa.kernel"
|
||||
ipa_ramdisk: "{{http_boot_folder}}/ipa.initramfs"
|
||||
ipa_kernel: "{{ http_boot_folder }}/ipa.kernel"
|
||||
ipa_ramdisk: "{{ http_boot_folder }}/ipa.initramfs"
|
||||
ipa_kernel_url: "{{ ipa_file_protocol }}://{{ internal_ip }}:{{ file_url_port }}/ipa.kernel"
|
||||
ipa_download_distro: >-
|
||||
{%- if ipa_upstream_release == "stable-train" -%}
|
||||
|
|
@ -87,23 +87,23 @@ ipa_download_distro: >-
|
|||
{%- endif -%}
|
||||
ipa_kernel_upstream_url: >-
|
||||
{%- if use_tinyipa | bool -%}
|
||||
{{tarballs_base_url}}/tinyipa/files/tinyipa-{{ ipa_upstream_release }}.vmlinuz
|
||||
{{ tarballs_base_url }}/tinyipa/files/tinyipa-{{ ipa_upstream_release }}.vmlinuz
|
||||
{%- else -%}
|
||||
{{tarballs_base_url}}/dib/files/ipa-{{ ipa_download_distro }}-{{ ipa_upstream_release }}.kernel
|
||||
{{ tarballs_base_url }}/dib/files/ipa-{{ ipa_download_distro }}-{{ ipa_upstream_release }}.kernel
|
||||
{%- endif -%}
|
||||
ipa_kernel_upstream_checksum_algo: "sha256"
|
||||
ipa_kernel_upstream_checksum_url: "{{ ipa_kernel_upstream_url }}.{{ ipa_kernel_upstream_checksum_algo }}"
|
||||
ipa_ramdisk_url: "{{ ipa_file_protocol }}://{{ internal_ip }}:{{ file_url_port }}/ipa.initramfs"
|
||||
ipa_ramdisk_upstream_url: >-
|
||||
{%- if use_tinyipa | bool -%}
|
||||
{{tarballs_base_url}}/tinyipa/files/tinyipa-{{ ipa_upstream_release }}.gz
|
||||
{{ tarballs_base_url }}/tinyipa/files/tinyipa-{{ ipa_upstream_release }}.gz
|
||||
{%- else -%}
|
||||
{{tarballs_base_url}}/dib/files/ipa-{{ ipa_download_distro }}-{{ ipa_upstream_release }}.initramfs
|
||||
{{ tarballs_base_url }}/dib/files/ipa-{{ ipa_download_distro }}-{{ ipa_upstream_release }}.initramfs
|
||||
{%- endif -%}
|
||||
ipa_ramdisk_upstream_checksum_algo: "sha256"
|
||||
ipa_ramdisk_upstream_checksum_url: "{{ ipa_ramdisk_upstream_url }}.{{ ipa_ramdisk_upstream_checksum_algo }}"
|
||||
deploy_image_filename: "deployment_image.qcow2"
|
||||
deploy_image: "{{http_boot_folder}}/{{deploy_image_filename}}"
|
||||
deploy_image: "{{ http_boot_folder }}/{{ deploy_image_filename }}"
|
||||
esp_image: "{{ http_boot_folder }}/esp.img"
|
||||
esp_image_url: "{{ ipa_file_protocol }}://{{ internal_ip }}:{{ file_url_port }}/esp.img"
|
||||
# Use cirros instead of building an image via diskimage-builder
|
||||
|
|
@ -255,7 +255,7 @@ inspector_extra_kernel_options: "ipa-inspection-collectors=default,logs"
|
|||
|
||||
enable_inspector_discovery: false
|
||||
|
||||
inspector_default_node_driver: "{{ 'manual-management' if enable_credential_less_deploy|bool else 'ipmi' }}"
|
||||
inspector_default_node_driver: "{{ 'manual-management' if enable_credential_less_deploy | bool else 'ipmi' }}"
|
||||
|
||||
# Inspector defaults (deprecated in Victoria)
|
||||
inspector:
|
||||
|
|
@ -266,7 +266,7 @@ inspector:
|
|||
# If baremetal nodes should be turned off after inspection.
|
||||
# The inspector default is to turn off the baremetal node
|
||||
# power, this setting to false enables use of fast track mode.
|
||||
power_off_after_inspection: "{{ not fast_track|bool }}"
|
||||
power_off_after_inspection: "{{ not fast_track | bool }}"
|
||||
|
||||
# We may not have packaged iPXE files on some distros, or may want to
|
||||
# download them on their own.
|
||||
|
|
|
|||
|
|
@ -124,7 +124,7 @@
|
|||
remote_src: true
|
||||
loop:
|
||||
- "{{ tftp_boot_folder }}"
|
||||
- "{{ http_boot_folder }}"
|
||||
- "{{ http_boot_folder }}"
|
||||
|
||||
- name: "Copy grub into serving folders"
|
||||
copy:
|
||||
|
|
@ -136,7 +136,7 @@
|
|||
remote_src: true
|
||||
loop:
|
||||
- "{{ tftp_boot_folder }}"
|
||||
- "{{ http_boot_folder }}"
|
||||
- "{{ http_boot_folder }}"
|
||||
|
||||
- name: "Set up iPXE for EFI booting"
|
||||
block:
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
|
||||
- name: "Configure BIOS interfaces if required"
|
||||
set_fact:
|
||||
enabled_bios_interfaces: >-
|
||||
enabled_bios_interfaces: >- # noqa jinja var-spacing
|
||||
no-bios
|
||||
{%- if "idrac" in enabled_hardware_types -%},idrac-redfish{%- endif -%}
|
||||
{%- if "ilo" in enabled_hardware_types -%},ilo{%- endif -%}
|
||||
|
|
@ -29,7 +29,7 @@
|
|||
|
||||
- name: "Configure boot interfaces if required"
|
||||
set_fact:
|
||||
enabled_boot_interfaces: >-
|
||||
enabled_boot_interfaces: >- # noqa jinja var-spacing
|
||||
ipxe,pxe
|
||||
{%- if "idrac" in enabled_hardware_types -%},idrac-redfish-virtual-media{%- endif -%}
|
||||
{%- if "ilo" in enabled_hardware_types -%},ilo-virtual-media{%- endif -%}
|
||||
|
|
@ -39,7 +39,7 @@
|
|||
|
||||
- name: "Configure management interfaces if required"
|
||||
set_fact:
|
||||
enabled_management_interfaces: >-
|
||||
enabled_management_interfaces: >- # noqa jinja var-spacing
|
||||
noop
|
||||
{%- if "idrac" in enabled_hardware_types -%},idrac-redfish{%- endif -%}
|
||||
{%- if "ilo" in enabled_hardware_types -%},ilo{%- endif -%}
|
||||
|
|
@ -51,19 +51,19 @@
|
|||
|
||||
- name: "Configure power interfaces if required"
|
||||
set_fact:
|
||||
enabled_power_interfaces: >-
|
||||
enabled_power_interfaces: >- # noqa jinja var-spacing
|
||||
fake
|
||||
{%- if "idrac" in enabled_hardware_types -%},idrac-redfish{%- endif -%}
|
||||
{%- if "ilo" in enabled_hardware_types -%},ilo{%- endif -%}
|
||||
{%- if "ipmi" in enabled_hardware_types -%},ipmitool{%- endif -%}
|
||||
{%- if "redfish" in enabled_hardware_types -%},redfish{%- endif -%}
|
||||
{%- if enable_credential_less_deploy|bool -%},agent{%- endif -%}
|
||||
{%- if enable_credential_less_deploy | bool -%},agent{%- endif -%}
|
||||
{%- if "staging-wol" in enabled_hardware_types -%},staging-wol{%- endif -%}
|
||||
when: not enabled_power_interfaces
|
||||
|
||||
- name: "Configure raid interfaces if required"
|
||||
set_fact:
|
||||
enabled_raid_interfaces: >-
|
||||
enabled_raid_interfaces: >- # noqa jinja var-spacing
|
||||
no-raid,agent
|
||||
{%- if "idrac" in enabled_hardware_types -%},idrac-redfish{%- endif -%}
|
||||
{%- if "ilo5" in enabled_hardware_types -%},ilo5{%- endif -%}
|
||||
|
|
@ -72,7 +72,7 @@
|
|||
|
||||
- name: "Configure vendor interfaces if required"
|
||||
set_fact:
|
||||
enabled_vendor_interfaces: >-
|
||||
enabled_vendor_interfaces: >- # noqa jinja var-spacing
|
||||
no-vendor
|
||||
{%- if "idrac" in enabled_hardware_types -%},idrac-redfish{%- endif -%}
|
||||
{%- if "ilo" in enabled_hardware_types -%},ilo{%- endif -%}
|
||||
|
|
|
|||
|
|
@ -12,5 +12,5 @@
|
|||
delegate_to: localhost
|
||||
|
||||
- name: "Defined ssh_private_key_path - Read SSH private key in"
|
||||
set_fact: ssh_private_key="{{ lookup('file', ssh_private_key_path ) }}"
|
||||
set_fact: ssh_private_key="{{ lookup('file', ssh_private_key_path) }}"
|
||||
no_log: true
|
||||
|
|
|
|||
|
|
@ -20,8 +20,8 @@
|
|||
config_project_name: "{{ config_project_name }}"
|
||||
config_region_name: "{{ config_region_name }}"
|
||||
config_auth_url: "{{ config_auth_url }}"
|
||||
config_project_domain_id: "{{ config_project_domain_id|default('default') }}"
|
||||
config_user_domain_id: "{{ config_user_domain_id|default('default') }}"
|
||||
config_project_domain_id: "{{ config_project_domain_id | default('default') }}"
|
||||
config_user_domain_id: "{{ config_user_domain_id | default('default') }}"
|
||||
when:
|
||||
- enable_keystone | default(false) | bool
|
||||
- clouds is undefined
|
||||
|
|
|
|||
|
|
@ -18,16 +18,16 @@
|
|||
- block:
|
||||
- name: "List bare metal nodes using CLI and clouds.yaml"
|
||||
command: baremetal --debug node list
|
||||
environment: "{{ bifrost_venv_env | combine({'OS_CLOUD': testing_cloud_name }) }}"
|
||||
environment: "{{ bifrost_venv_env | combine({'OS_CLOUD': testing_cloud_name}) }}"
|
||||
|
||||
- name: "List introspection rules using CLI and clouds.yaml"
|
||||
command: baremetal --debug introspection rule list
|
||||
environment: "{{ bifrost_venv_env | combine({'OS_CLOUD': testing_cloud_name }) }}"
|
||||
environment: "{{ bifrost_venv_env | combine({'OS_CLOUD': testing_cloud_name}) }}"
|
||||
when: enable_inspector | bool
|
||||
|
||||
- name: "List services using CLI and clouds.yaml"
|
||||
command: openstack --debug service list
|
||||
environment: "{{ bifrost_venv_env | combine({'OS_CLOUD': 'bifrost-admin' }) }}"
|
||||
environment: "{{ bifrost_venv_env | combine({'OS_CLOUD': 'bifrost-admin'}) }}"
|
||||
when:
|
||||
- enable_keystone | bool
|
||||
- "'bifrost-admin' in clouds"
|
||||
|
|
|
|||
|
|
@ -17,19 +17,19 @@ ipa_git_url: "{{ git_url_root }}/openstack/ironic-python-agent"
|
|||
ipa_builder_git_url: "{{ git_url_root }}/openstack/ironic-python-agent-builder"
|
||||
prometheus_exporter_git_url: "{{ git_url_root }}/openstack/ironic-prometheus-exporter"
|
||||
# *_git_folder can be overridden by local clones for offline installs
|
||||
ironicclient_git_folder: "{{ git_root}}/python-ironicclient"
|
||||
ironic_git_folder: "{{ git_root}}/ironic"
|
||||
ironicinspector_git_folder: "{{ git_root}}/ironic-inspector"
|
||||
ironicinspectorclient_git_folder: "{{ git_root}}/python-ironic-inspector-client"
|
||||
openstacksdk_git_folder: "{{ git_root}}/openstacksdk"
|
||||
ironicclient_git_folder: "{{ git_root }}/python-ironicclient"
|
||||
ironic_git_folder: "{{ git_root }}/ironic"
|
||||
ironicinspector_git_folder: "{{ git_root }}/ironic-inspector"
|
||||
ironicinspectorclient_git_folder: "{{ git_root }}/python-ironic-inspector-client"
|
||||
openstacksdk_git_folder: "{{ git_root }}/openstacksdk"
|
||||
dib_git_folder: "{{ git_root }}/diskimage-builder"
|
||||
reqs_git_folder: "{{ git_root }}/requirements"
|
||||
staging_drivers_git_folder: "{{ git_root }}/ironic-staging-drivers"
|
||||
keystone_git_folder: "{{ git_root}}/keystone"
|
||||
sushy_git_folder: "{{ git_root}}/sushy"
|
||||
ipa_git_folder: "{{ git_root}}/ironic-python-agent"
|
||||
ipa_builder_git_folder: "{{ git_root}}/ironic-python-agent-builder"
|
||||
prometheus_exporter_git_folder: "{{ git_root}}/ironic-prometheus-exporter"
|
||||
keystone_git_folder: "{{ git_root }}/keystone"
|
||||
sushy_git_folder: "{{ git_root }}/sushy"
|
||||
ipa_git_folder: "{{ git_root }}/ironic-python-agent"
|
||||
ipa_builder_git_folder: "{{ git_root }}/ironic-python-agent-builder"
|
||||
prometheus_exporter_git_folder: "{{ git_root }}/ironic-prometheus-exporter"
|
||||
# *git_branch can be overridden for stable branch testing
|
||||
git_branch: master
|
||||
ironicclient_git_branch: "{{ git_branch }}"
|
||||
|
|
|
|||
Loading…
Reference in New Issue