Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/playbooks/tasks/inherit_parent_scenario.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,4 +27,4 @@
- item is exists
ansible.builtin.include_vars:
file: "{{ item }}"
loop: "{{ _file_list }}"
loop: "{{ _file_list | from_yaml }}"
3 changes: 2 additions & 1 deletion roles/config_drive/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,8 @@
register: _net_data_change
when:
- cifmw_config_drive_networkconfig is defined
- cifmw_config_drive_networkconfig
- cifmw_config_drive_networkconfig is not none
- cifmw_config_drive_networkconfig | length > 0
ansible.builtin.template:
backup: true
src: "network-config.j2"
Expand Down
2 changes: 1 addition & 1 deletion roles/dnsmasq/tasks/manage_address.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
that:
- item.state is defined
- item.state in ['present', 'absent']
- item.ipaddr is undefined or (item.ipaddr is defined and (item.ipaddr | ansible.utils.ipaddr))
- item.ipaddr is undefined or (item.ipaddr is defined and ((item.ipaddr | ansible.utils.ipaddr) | ternary(true, false)))
- item.domains is defined
- (item.domains | type_debug) == "list"
loop: "{{ cifmw_dnsmasq_address }}"
Expand Down
6 changes: 3 additions & 3 deletions roles/install_ca/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,9 @@

- name: Update ca bundle
vars:
_ca_bundle_changed: ca_bundle is defined and ca_bundle is changed
_ca_inline_changed: ca_inline is defined and ca_inline is changed
_ca_url_changed: cifmw_install_ca_url is defined
_ca_bundle_changed: "{{ ca_bundle is defined and ca_bundle is changed }}"
_ca_inline_changed: "{{ ca_inline is defined and ca_inline is changed }}"
_ca_url_changed: "{{ cifmw_install_ca_url is defined }}"
when:
- _ca_url_changed or _ca_bundle_changed or _ca_inline_changed
ansible.builtin.command:
Expand Down
6 changes: 3 additions & 3 deletions roles/libvirt_manager/tasks/volumes.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
{{
[cifmw_libvirt_manager_ocp_pool_dir, _vol_name] | path_join
}}
loop: "{{ range(0, vol_num | int) }}"
loop: "{{ range(0, vol_num | int) | list }}"
loop_control:
index_var: vol_id
label: "{{ vol_prefix }}-vol-{{ vol_id }}"
Expand Down Expand Up @@ -80,7 +80,7 @@
{% endif %}
--capacity {{ vol_size }}
--format {{ vol_format | default('qcow2') }}
loop: "{{ range(0, vol_num | int) }}"
loop: "{{ range(0, vol_num | int) | list }}"
loop_control:
index_var: vol_id
label: "{{ vol_prefix }}-vol-{{ vol_id }}"
Expand All @@ -92,7 +92,7 @@
dest: "{{ _pool_dir }}/{{ vol_prefix }}-vol-{{ vol_id }}.xml"
src: "attach-volume.xml.j2"
mode: "0644"
loop: "{{ range(0, vol_num | int) }}"
loop: "{{ range(0, vol_num | int) | list }}"
loop_control:
index_var: vol_id
label: "{{ vol_prefix }}-vol-{{ vol_id }}"
2 changes: 1 addition & 1 deletion roles/reproducer/tasks/generate_bm_info.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
mode: "0644"

- name: Output ironic_nodes to file
when: cifmw_reproducer_ironic_node_name_prefix
when: cifmw_reproducer_ironic_node_name_prefix | default(false) | bool
ansible.builtin.copy:
dest: "{{ cifmw_basedir }}/parameters/ironic_nodes.yaml"
content: |
Expand Down
2 changes: 1 addition & 1 deletion roles/sushy_emulator/tasks/collect_details.yml
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
{% endfor -%}
{{ matching_vms }}
ansible.builtin.set_fact:
_cifmw_sushy_emulator_instances: "{{ _matching_vms | regex_replace('\n(?!.*\n)', ', ')}}"
_cifmw_sushy_emulator_instances: "{{ _matching_vms }}"
when:
- _matching_vms | length > 0

Expand Down
6 changes: 6 additions & 0 deletions scenarios/reproducers/va-hci.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,12 @@
---
cifmw_parent_scenario: "scenarios/reproducers/va-hci-base.yml"

# Define compute VM settings (required when overriding cifmw_libvirt_manager_configuration)
cifmw_libvirt_manager_compute_amount: 3
cifmw_libvirt_manager_compute_disksize: 50
cifmw_libvirt_manager_compute_memory: 8
cifmw_libvirt_manager_compute_cpus: 4

# HERE if you want to override kustomization, you can uncomment this parameter
# and push the data structure you want to apply.
# cifmw_architecture_user_kustomize:
Expand Down
Loading