Merge pull request #552 from stackhpc/upstream/2023.1-2024-04-01

Synchronise 2023.1 with upstream

ansible/roles/loadbalancer/tasks/config-host.yml

@@ -1,4 +1,10 @@
 ---
+
+- name: Check IPv6 support
+  command: /usr/sbin/sysctl -n net.ipv6.conf.all.disable_ipv6
+  register: ipv6_disabled
+  changed_when: false
+
 - name: Setting sysctl values
   vars:
     should_set: "{{ item.value != 'KOLLA_UNSET' }}"
@@ -17,6 +23,7 @@
   when:
     - set_sysctl | bool
     - item.value != 'KOLLA_SKIP'
+    - not ('ipv6' in item.name and ipv6_disabled.stdout | bool)
 
 - name: Load and persist keepalived module
   import_role:

ansible/roles/neutron/tasks/config-host.yml

@@ -12,6 +12,11 @@
     list |
     length > 0
 
+- name: Check IPv6 support
+  command: /usr/sbin/sysctl -n net.ipv6.conf.all.disable_ipv6
+  register: ipv6_disabled
+  changed_when: false
+
 - name: Setting sysctl values
   become: true
   vars:
@@ -34,3 +39,4 @@
     - set_sysctl | bool
     - item.value != 'KOLLA_SKIP'
     - (neutron_l3_agent.enabled | bool and neutron_l3_agent.host_in_groups | bool)
+    - not ('ipv6' in item.name and ipv6_disabled.stdout | bool)

ansible/roles/ovs-dpdk/vars/main.yml

@@ -1,2 +1,4 @@
 ---
 project_name: "ovs"
+
+kolla_role_name: "ovsdpdk"

releasenotes/notes/bug-1906306-640d5085576656f9.yaml

@@ -0,0 +1,8 @@
+---
+fixes:
+  - |
+    Add conditionals for IPv6 sysctl settings
+    that have IPV6 disabled in kernel.
+    Changing sysctl settings related to IPv6 on those
+    systems lead to errors.
+    `LP#1906306 <https://launchpad.net/bugs/1906306>`__

releasenotes/notes/bug-2041864-f19f9a6afd0955e8.yaml

@@ -0,0 +1,5 @@
+---
+fixes:
+  - |
+    Fixes ``ovs-dpdk`` images pull.
+    `LP#[2041864] <https://launchpad.net/bugs/2041864>`__