openstack/openstack-ansible
Code Issues Proposed changes

Merge "Make container_interface optional for provider network"

Browse Source
This commit is contained in:
Zuul 2019-01-18 18:05:57 +00:00 committed by Gerrit Code Review
commit 017f736804
4 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/source/admin/openstack-operations/managing-networks.rst
View File

@ -45,7 +45,9 @@ add a new block underneath the ``provider_networks`` section:
The ``container_bridge`` setting defines the physical network bridge used The ``container_bridge`` setting defines the physical network bridge used
to connect the veth pair from the physical host to the container. to connect the veth pair from the physical host to the container.
Inside the container, the ``container_interface`` setting defines the name Inside the container, the ``container_interface`` setting defines the name
at which the physical network will be made available. at which the physical network will be made available. The
``container_interface`` setting is not required when Neutron agents are
deployed on bare metal.
Make sure that both settings are uniquely defined across their provider Make sure that both settings are uniquely defined across their provider
networks and that the network interface is correctly configured inside your networks and that the network interface is correctly configured inside your
operating system. operating system.

5
etc/openstack_deploy/openstack_user_config.yml.example
View File

@ -140,7 +140,10 @@
# #
# Option: container_interface (required, string) # Option: container_interface (required, string)
# Name of unique interface in containers to use for this network. # Name of unique interface in containers to use for this network.
# Typical values include 'eth1', 'eth2', etc. # Typical values include 'eth1', 'eth2', etc. This option is OPTIONAL
# for Neutron provider network definitions when Neutron agents are
# deployed on bare metal (default), but REQUIRED when agents are
# deployed in containers and for all other non-Neutron use-cases.
# NOTE: Container interface is different from host interfaces. # NOTE: Container interface is different from host interfaces.
# #
# Option: container_type (required, string) # Option: container_type (required, string)

2
osa_toolkit/generate.py
View File

@ -745,7 +745,7 @@ def container_skel_load(container_skel, inventory, config):
ip_q=ip_from_q, ip_q=ip_from_q,
q_name=q_name, q_name=q_name,
netmask=netmask, netmask=netmask,
interface=p_net['container_interface'], interface=p_net.get('container_interface'),
bridge=p_net['container_bridge'], bridge=p_net['container_bridge'],
net_type=p_net.get('container_type'), net_type=p_net.get('container_type'),
net_mtu=p_net.get('container_mtu'), net_mtu=p_net.get('container_mtu'),

6
releasenotes/notes/provider-network-container-interface-opt-80263aebc5b8e7c3.yaml Normal file
View File

@ -0,0 +1,6 @@
---
features:
- |
The ``container_interface`` provider network option is no longer required
for Neutron provider network definitions when related agents or OVN
controllers are deployed on bare metal.