diff --git a/dev/tenks-deploy-config-compute-libvirt-on-host.yml b/dev/tenks-deploy-config-compute-libvirt-on-host.yml index d8cd1a14f..a6b80c104 100644 --- a/dev/tenks-deploy-config-compute-libvirt-on-host.yml +++ b/dev/tenks-deploy-config-compute-libvirt-on-host.yml @@ -54,3 +54,9 @@ libvirt_vm_emulator: "{% if ansible_facts.os_family == 'RedHat' %}/usr/libexec/q # Specify a log path in the kolla_logs Docker volume. It is accessible on the # host at the same path. libvirt_vm_default_console_log_dir: "/var/log/kolla/tenks" + +# NOTE(priteau): Disable libvirt_vm_trust_guest_rx_filters, which when enabled +# triggers the following errors when booting baremetal instances with Tenks on +# Libvirt 9: Cannot set interface flags on 'macvtap1': Value too large for +# defined data type +libvirt_vm_trust_guest_rx_filters: false diff --git a/dev/tenks-deploy-config-compute.yml b/dev/tenks-deploy-config-compute.yml index 0f859ccd9..984852bcb 100644 --- a/dev/tenks-deploy-config-compute.yml +++ b/dev/tenks-deploy-config-compute.yml @@ -55,3 +55,9 @@ libvirt_vm_default_console_log_dir: "/var/log/kolla/tenks" # Console logs are owned by the ID of the Nova user in the nova_libvirt # container. libvirt_vm_log_owner: 42436 + +# NOTE(priteau): Disable libvirt_vm_trust_guest_rx_filters, which when enabled +# triggers the following errors when booting baremetal instances with Tenks on +# Libvirt 9: Cannot set interface flags on 'macvtap1': Value too large for +# defined data type +libvirt_vm_trust_guest_rx_filters: false diff --git a/playbooks/kayobe-overcloud-base/run.yml b/playbooks/kayobe-overcloud-base/run.yml index 7468c32a1..ddcae18e5 100644 --- a/playbooks/kayobe-overcloud-base/run.yml +++ b/playbooks/kayobe-overcloud-base/run.yml @@ -41,5 +41,3 @@ cmd: dev/overcloud-test-baremetal.sh &> {{ logs_dir }}/ansible/overcloud-test-baremetal chdir: "{{ kayobe_src_dir }}" executable: /bin/bash - # FIXME(priteau): Bare metal testing fails on RL9/c9s with Libvirt 9.0.0 - when: ansible_facts.os_family == 'Debian' diff --git a/playbooks/kayobe-overcloud-upgrade-base/run.yml b/playbooks/kayobe-overcloud-upgrade-base/run.yml index 6564a8ea4..9fde32311 100644 --- a/playbooks/kayobe-overcloud-upgrade-base/run.yml +++ b/playbooks/kayobe-overcloud-upgrade-base/run.yml @@ -81,8 +81,6 @@ cmd: dev/overcloud-test-baremetal.sh &> {{ logs_dir }}/ansible/overcloud-test-bm-pre-upgrade chdir: "{{ previous_kayobe_src_dir }}" executable: /bin/bash - # FIXME(priteau): Bare metal testing fails on RL9/c9s with Libvirt 9.0.0 - when: ansible_facts.os_family == 'Debian' # Upgrade Kayobe, and use it to perform an upgrade of the control plane. @@ -110,8 +108,6 @@ cmd: dev/overcloud-test-baremetal.sh &> {{ logs_dir }}/ansible/overcloud-test-bm-post-upgrade chdir: "{{ kayobe_src_dir }}" executable: /bin/bash - # FIXME(priteau): Bare metal testing fails on RL9/c9s with Libvirt 9.0.0 - when: ansible_facts.os_family == 'Debian' environment: KAYOBE_CONFIG_SOURCE_PATH: "{{ kayobe_config_src_dir }}" diff --git a/zuul.d/jobs.yaml b/zuul.d/jobs.yaml index 8e7c3db08..131ef7875 100644 --- a/zuul.d/jobs.yaml +++ b/zuul.d/jobs.yaml @@ -162,7 +162,7 @@ OpenStack release, and upgrades it to the current release. pre-run: playbooks/kayobe-overcloud-upgrade-base/pre.yml run: playbooks/kayobe-overcloud-upgrade-base/run.yml - timeout: 9000 + timeout: 10800 - job: name: kayobe-overcloud-upgrade-rocky9