Skip to content
Snippets Groups Projects
Commit 5b914513 authored by Zuul's avatar Zuul Committed by Gerrit Code Review
Browse files

Merge "Bump version of MichaelRigart.interfaces" into stable/2024.2

parents b9aca698 748486e2
No related branches found
No related tags found
No related merge requests found
......@@ -274,7 +274,7 @@ function environment_setup {
function run_kayobe {
# Run a kayobe command, including extra arguments provided via
# $KAYOBE_EXTRA_ARGS.
kayobe ${KAYOBE_EXTRA_ARGS} $*
kayobe ${KAYOBE_EXTRA_ARGS} "${@}"
}
function control_host_bootstrap {
......@@ -593,6 +593,25 @@ function overcloud_test_init {
fi
}
function overcloud_test_bounce_interface {
shift
LIMIT=$1
INTERFACE=$2
environment_setup
# Change current configuration so that a subsequent host configure will bounce the interfaces:
if is_dnf; then
# Rocky
run_kayobe overcloud host command run -b --command "rm -f /etc/NetworkManager/system-connections/$INTERFACE.nmconnection" --limit "$LIMIT"
else
# Ubuntu
run_kayobe overcloud host command run -b --command "rm -f /etc/systemd/network/50-kayobe-$INTERFACE.network" --limit "$LIMIT"
fi
# Trigger bounce
run_kayobe overcloud host configure -t network
}
function overcloud_test {
set -eu
......
#!/bin/bash
set -eu
set -o pipefail
# Bounces a given interface on hosts matching the supplied limit.
# Positional arguments:
# arg0: Ansible limit
# arg1: Interface to bounce
PARENT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
source "${PARENT}/functions"
function main {
config_init
overcloud_test_bounce_interface controllers "${@}"
}
main "${@:1}"
......@@ -10,6 +10,11 @@
testinfra_venv: ~/testinfra-venv
test_path: "{{ kayobe_src_dir }}/playbooks/kayobe-overcloud-host-configure-base/tests/"
tasks:
- name: Prevent NetworkManager from managing default interface
command: 'nmcli dev set {{ ansible_facts.default_ipv4.interface }} managed no'
become: true
when: ansible_facts.os_family == 'RedHat'
- name: Ensure overcloud is deployed
shell:
cmd: "{{ kayobe_src_dir }}/dev/overcloud-deploy.sh &> {{ logs_dir }}/ansible/overcloud-deploy"
......@@ -29,3 +34,8 @@
command: "{{ testinfra_venv }}/bin/py.test {{ test_path }} --html={{ logs_dir }}/test-results.html --self-contained-html"
environment:
SITE_MIRROR_FQDN: "{{ zuul_site_mirror_fqdn }}"
- name: Test bouncing interfaces
shell:
cmd: "{{ kayobe_src_dir }}/dev/overcloud-test-bounce-interface.sh controllers br1 &> {{ logs_dir }}/ansible/overcloud-test-bounce-interface"
executable: /bin/bash
---
fixes:
- |
Fixes an issue where slave interfaces would not be brought back up when
bouncing the master interface.
`LP#2072340 <https://bugs.launchpad.net/kayobe/+bug/2072340>`_.
......@@ -27,7 +27,7 @@ roles:
# There are no versioned releases of this role.
version: acd08fd126d0e442ab8b3bc518e37761390d8c2f
- src: MichaelRigart.interfaces
version: v1.14.4
version: v1.15.1
- src: mrlesmithjr.chrony
version: v0.1.4
- src: mrlesmithjr.manage_lvm
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment