Merge "Add IPv6 configuration options to Octavia management network"

ansible/roles/octavia/defaults/main.yml

@@ -227,6 +227,9 @@ octavia_amp_security_groups:
 # - gateway_ip (optional)
 # - name
 # - no_gateway_ip (optional)
+# - ip_version (optional)
+# - ipv6_address_mode (optional)
+# - ipv6_ra_mode (optional)
 octavia_amp_network:
   name: lb-mgmt-net
   shared: false

ansible/roles/octavia/tasks/prepare.yml

@@ -127,5 +127,8 @@
       enable_dhcp: "{{ octavia_amp_network['subnet']['enable_dhcp'] | default(omit) }}"
       no_gateway_ip: "{{ octavia_amp_network['subnet']['no_gateway_ip'] | default(omit) }}"
       gateway_ip: "{{ octavia_amp_network['gateway_ip'] | default(omit, true) }}"
+      ip_version: "{{ octavia_amp_network['subnet']['ip_version'] | default(omit) }}"
+      ipv6_address_mode: "{{ octavia_amp_network['subnet']['ipv6_address_mode'] | default(omit) }}"
+      ipv6_ra_mode: "{{ octavia_amp_network['subnet']['ipv6_ra_mode'] | default(omit) }}"
   run_once: True
   delegate_to: "{{ groups['octavia-api'][0] }}"

doc/source/reference/networking/octavia.rst

@@ -176,6 +176,9 @@ The subnet parameter has the following supported parameters:
 - ``gateway_ip`` (optional)
 - ``name``
 - ``no_gateway_ip`` (optional)
+- ``ip_version`` (optional)
+- ``ipv6_address_mode`` (optional)
+- ``ipv6_ra_mode`` (optional)
 
 For example:
 

etc/kolla/globals.yml

@@ -772,6 +772,9 @@
 # - gateway_ip (optional)
 # - name
 # - no_gateway_ip (optional)
+# - ip_version (optional)
+# - ipv6_address_mode (optional)
+# - ipv6_ra_mode (optional)
 #octavia_amp_network:
 #  name: lb-mgmt-net
 #  shared: false