Merge pull request #562 from stackhpc/upstream/yoga-2024-05-06

Synchronise yoga with upstream
stackhpc · May 6, 2024 · d2d91e0 · d2d91e0
2 parents 0e09856 + a89f92e
commit d2d91e0
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 0 deletions.
diff --git a/ansible/roles/loadbalancer/tasks/config-host.yml b/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:

diff --git a/ansible/roles/neutron/tasks/config-host.yml b/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:
@@ -38,3 +43,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)
diff --git a/releasenotes/notes/bug-1906306-640d5085576656f9.yaml b/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>`__