From 18ca11b47af42ce10507516c2f9e34f447d5e39a Mon Sep 17 00:00:00 2001
From: Pierre Riteau <pierre@stackhpc.com>
Date: Fri, 1 Dec 2023 15:52:47 +0100
Subject: [PATCH 1/3] [release] Sync with Kolla Ansible for 2023.2 (partially)

Change-Id: I5cd9dacea10f0e00b3d481704f0949b6f5c4a69e
---
 ansible/roles/kolla-ansible/templates/overcloud-components.j2 | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ansible/roles/kolla-ansible/templates/overcloud-components.j2 b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
index 4c529f2b5..83d01ef12 100644
--- a/ansible/roles/kolla-ansible/templates/overcloud-components.j2
+++ b/ansible/roles/kolla-ansible/templates/overcloud-components.j2
@@ -166,3 +166,6 @@ loadbalancer
 
 [caso:children]
 monitoring
+
+[letsencrypt:children]
+loadbalancer

From ce272ff6771e9cd1e0ff61364c96e1f0d7bf6a25 Mon Sep 17 00:00:00 2001
From: Massimiliano Favaro-Bedford <78351765+MaxBed4d@users.noreply.github.com>
Date: Thu, 2 Oct 2025 13:58:10 +0100
Subject: [PATCH 2/3] Update functions

---
 dev/functions | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/dev/functions b/dev/functions
index 88630cf6f..6088f7a27 100644
--- a/dev/functions
+++ b/dev/functions
@@ -775,6 +775,39 @@ function tenks_deploy {
     run_tenks_playbook "$tenks_path" deploy.yml "$tenks_deploy_type"
 }
 
+function tenks_reboot_network_fix {
+    set -eu
+    # Create a simple test Tenks deployment. Assumes that a bridge named
+    # 'breth1' exists.  Arguments:
+    # $1: The path to the Tenks repo.
+    local tenks_path="$1"
+    local tenks_deploy_type="${2:-default}"
+
+    echo "Configuring missing Tenks host network"
+
+    environment_setup
+
+    # We don't want to use the Kayobe venv.
+    deactivate
+
+    # Install the Tenks venv.
+    install_venv_system_site_packages "${TENKS_VENV_PATH}" "$tenks_path" -c "$UPPER_CONSTRAINTS_FILE"
+    source ${TENKS_VENV_PATH:-$HOME/tenks-test-venv}/bin/activate
+
+    ${KAYOBE_SOURCE_PATH}/tools/ansible-galaxy-retried.sh install \
+        --role-file="$tenks_path/requirements.yml" \
+        --roles-path="$tenks_path/ansible/roles/"
+
+    local parent="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+    # Install a trivial script for ovs-vsctl that talks to containerised Open
+    # vSwitch.
+    sudo cp --no-clobber "$parent/ovs-vsctl" /usr/bin/ovs-vsctl
+
+    run_tenks_playbook "$tenks_path" host_setup.yml
+    run_tenks_playbook "$tenks_path" node_networking.yml "$tenks_deploy_type"
+}
+
 function tenks_teardown {
     set -eu
     # Tear down a test Tenks deployment.

From 1afe8c69498d63c09290892a043c43e8a1cf6c0e Mon Sep 17 00:00:00 2001
From: Massimiliano Favaro-Bedford <78351765+MaxBed4d@users.noreply.github.com>
Date: Thu, 2 Oct 2025 13:59:14 +0100
Subject: [PATCH 3/3] Create tenks-network-reboot-patch.sh

---
 dev/tenks-network-reboot-patch.sh | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 dev/tenks-network-reboot-patch.sh

diff --git a/dev/tenks-network-reboot-patch.sh b/dev/tenks-network-reboot-patch.sh
new file mode 100644
index 000000000..ff1665517
--- /dev/null
+++ b/dev/tenks-network-reboot-patch.sh
@@ -0,0 +1,26 @@
+#!/bin/bash
+
+set -eu
+set -o pipefail
+
+# Simple script to configure and deploy a Tenks cluster. This should be
+# executed from within the VM. Arguments:
+# $1: The path to the Tenks repo.
+
+PARENT="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+
+source "${PARENT}/functions"
+
+
+function main {
+    if [ -z ${1+x} ]; then
+        echo "Usage: $0 <tenks repo path>"
+        return 1
+    fi
+    tenks_path="$1"
+
+    config_init
+    tenks_reboot_network_fix "$tenks_path" overcloud
+}
+
+main "$@"