openstack
/
openstack-ansible-os_octavia
Code Issues Proposed changes

Merge "Make octavia_provider_network better configurable"

This commit is contained in:
Zuul 2022-05-11 13:52:42 +00:00 committed by Gerrit Code Review
parent ebac6ccb5e 941e671e06
commit 7846562859
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
defaults/main.yml
View File

@ -322,7 +322,7 @@ octavia_user_haproxy_templates: {}
# Name of the Octavia management network in Neutron # Name of the Octavia management network in Neutron
octavia_neutron_management_network_name: lbaas-mgmt octavia_neutron_management_network_name: lbaas-mgmt
# Name of the provider net in the system # Name of the Neutron provider net in the system (flat, vlan, ...)
octavia_provider_network_name: lbaas octavia_provider_network_name: lbaas
# Network type # Network type
octavia_provider_network_type: flat octavia_provider_network_type: flat
@ -337,9 +337,10 @@ octavia_management_net_subnet_allocation_pools: ""
octavia_management_net_dhcp: "True" octavia_management_net_dhcp: "True"
# Should Octavia set up the network and subnet? # Should Octavia set up the network and subnet?
octavia_service_net_setup: True octavia_service_net_setup: True
# This sets it to the container management network based on how you setup # This should match net_name from provider_networks structure in openstack_user_config
# the provider net octavia_provider_inventory_net_name: "{{ octavia_provider_network_name }}"
octavia_provider_network: "{{ provider_networks|map(attribute='network')|selectattr('net_name','defined')|selectattr('net_name', 'equalto', octavia_provider_network_name)|list|first }}" # This gets container managment network structure based on octavia_provider_inventory_net_name
octavia_provider_network: "{{ provider_networks|map(attribute='network')|selectattr('net_name','defined')|selectattr('net_name', 'equalto', octavia_provider_inventory_net_name)|list|first }}"
# The name of the network address pool # The name of the network address pool
octavia_container_network_name: "{{ octavia_provider_network['ip_from_q'] }}_address" octavia_container_network_name: "{{ octavia_provider_network['ip_from_q'] }}_address"
octavia_hm_group: "octavia-health-manager" octavia_hm_group: "octavia-health-manager"

3
doc/source/configure-octavia.rst
View File

@ -133,6 +133,7 @@ look like this:
container_interface: "eth14" container_interface: "eth14"
ip_from_q: "lbaas" ip_from_q: "lbaas"
type: "raw" type: "raw"
net_name: lbaas
group_binds: group_binds:
- neutron_linuxbridge_agent - neutron_linuxbridge_agent
- octavia-worker - octavia-worker
@ -146,7 +147,7 @@ Add extend ``user_variables.yml`` with following overrides:
octavia_provider_network_name: vlan octavia_provider_network_name: vlan
octavia_provider_network_type: vlan octavia_provider_network_type: vlan
octavia_provider_segmentation_id: 400 octavia_provider_segmentation_id: 400
octavia_container_network_name: lbaas_address octavia_provider_inventory_net_name: lbaas
In addition to this, you will need to ensure that you have an interface that In addition to this, you will need to ensure that you have an interface that
links neutron-managed br-vlan with br-lbaas on the controller nodes (for the case links neutron-managed br-vlan with br-lbaas on the controller nodes (for the case